Skip to content

Commit 94774b2

Browse files
tkiskybroonie
authored andcommitted
ALSA: ASoc: DaVinci Delay start of ASP to trigger
Since only 4 mainline ASoC codecs support the trigger callback, we cannot rely upon them stopping the frame clock if they are master and must assume it is running even if the sound is paused. Thus we cannot start the ASP until the trigger method. Signed-off-by: Troy Kisky <[email protected]> Signed-off-by: Martin Ambrose <[email protected]> Signed-off-by: Mark Brown <[email protected]>
1 parent 6c20c80 commit 94774b2

File tree

1 file changed

+0
-6
lines changed

1 file changed

+0
-6
lines changed

sound/soc/davinci/davinci-i2s.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -574,10 +574,6 @@ static int davinci_i2s_prepare(struct snd_pcm_substream *substream,
574574
struct davinci_mcbsp_dev *dev = snd_soc_dai_get_drvdata(dai);
575575
int playback = (substream->stream == SNDRV_PCM_STREAM_PLAYBACK);
576576
davinci_mcbsp_stop(dev, playback);
577-
if ((dev->pcr & DAVINCI_MCBSP_PCR_FSXM) == 0) {
578-
/* codec is master */
579-
davinci_mcbsp_start(dev, substream);
580-
}
581577
return 0;
582578
}
583579

@@ -587,8 +583,6 @@ static int davinci_i2s_trigger(struct snd_pcm_substream *substream, int cmd,
587583
struct davinci_mcbsp_dev *dev = snd_soc_dai_get_drvdata(dai);
588584
int ret = 0;
589585
int playback = (substream->stream == SNDRV_PCM_STREAM_PLAYBACK);
590-
if ((dev->pcr & DAVINCI_MCBSP_PCR_FSXM) == 0)
591-
return 0; /* return if codec is master */
592586

593587
switch (cmd) {
594588
case SNDRV_PCM_TRIGGER_START:

0 commit comments

Comments
 (0)