[PATCH 1/1] ALSA: ASoc: DaVinci Delay start of ASP to trigger

[PATCH 1/1] ALSA: ASoc: DaVinci Delay start of ASP to trigger

[martin]

From: Troy Kisky <troy.kisky@boundarydevices.com>

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 <troy.kisky@boundarydevices.com>
Signed-off-by: Martin Ambrose <martin@ti.com>

---
 sound/soc/davinci/davinci-i2s.c |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)

diff --git a/sound/soc/davinci/davinci-i2s.c b/sound/soc/davinci/davinci-i2s.c
index 9e8932a..a66c237 100644
--- a/sound/soc/davinci/davinci-i2s.c
+++ b/sound/soc/davinci/davinci-i2s.c
@@ -572,10 +572,6 @@ static int davinci_i2s_prepare(struct snd_pcm_substream *substream,
 	struct davinci_mcbsp_dev *dev = dai->private_data;
 	int playback = (substream->stream == SNDRV_PCM_STREAM_PLAYBACK);
 	davinci_mcbsp_stop(dev, playback);
-	if ((dev->pcr & DAVINCI_MCBSP_PCR_FSXM) == 0) {
-		/* codec is master */
-		davinci_mcbsp_start(dev, substream);
-	}
 	return 0;
 }
 
@@ -585,8 +581,6 @@ static int davinci_i2s_trigger(struct snd_pcm_substream *substream, int cmd,
 	struct davinci_mcbsp_dev *dev = dai->private_data;
 	int ret = 0;
 	int playback = (substream->stream == SNDRV_PCM_STREAM_PLAYBACK);
-	if ((dev->pcr & DAVINCI_MCBSP_PCR_FSXM) == 0)
-		return 0;	/* return if codec is master */
 
 	switch (cmd) {
 	case SNDRV_PCM_TRIGGER_START:
-- 
1.7.0.4

Re: [PATCH 1/1] ALSA: ASoc: DaVinci Delay start of ASP to trigger

[Liam Girdwood]

On Sun, 2010-10-03 at 16:44 -0500, martin@ti.com wrote:
> From: Troy Kisky <troy.kisky@boundarydevices.com>
> 
> 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 <troy.kisky@boundarydevices.com>
> Signed-off-by: Martin Ambrose <martin@ti.com>

Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>

-- 
Freelance Developer, SlimLogic Ltd
ASoC and Voltage Regulator Maintainer.
http://www.slimlogic.co.uk

Re: [PATCH 1/1] ALSA: ASoc: DaVinci Delay start of ASP to trigger

[Mark Brown]

On Sun, Oct 03, 2010 at 04:44:19PM -0500, martin@ti.com wrote:
> From: Troy Kisky <troy.kisky@boundarydevices.com>
> 
> 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.

Applied, thanks.