diff mbox

ASoC: tlv320aic3x: Fix data delay configuration

Message ID 1422621751-30484-1-git-send-email-peter.ujfalusi@ti.com (mailing list archive)
State Accepted
Commit 0b65ba9981d8fe80fd099f26dd96c60e07729aeb
Headers show

Commit Message

Peter Ujfalusi Jan. 30, 2015, 12:42 p.m. UTC
Fix the issue introduced by:
368494093354 ASoC: tlv320aic3x: Add TDM support

The CTRLC register were not receiving the correct delay configuration,
which will corrupt DSP_A audio mode.

Reported-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
Hi,

most of my boards are using DSP_B or I2S mode... This is why this is slipped.

Peter

 sound/soc/codecs/tlv320aic3x.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Pavel Machek Jan. 30, 2015, 12:52 p.m. UTC | #1
Hi!

> Fix the issue introduced by:
> 368494093354 ASoC: tlv320aic3x: Add TDM support
> 
> The CTRLC register were not receiving the correct delay configuration,
> which will corrupt DSP_A audio mode.
> 
> Reported-by: Pavel Machek <pavel@ucw.cz>
> Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>

Tested-by: Pavel Machek <pavel@ucw.cz>

Thanks for a fix!

									Pavel
Takashi Iwai Jan. 30, 2015, 2:18 p.m. UTC | #2
At Fri, 30 Jan 2015 14:42:31 +0200,
Peter Ujfalusi wrote:
> 
> Fix the issue introduced by:
> 368494093354 ASoC: tlv320aic3x: Add TDM support

Please put "Fixes:" tag in such a case.

I guess we'll have a chance to send the last pull request for 3.19 in
the next week.  If we miss it, we'll have to mark this with Cc to
stable.


Takashi

> 
> The CTRLC register were not receiving the correct delay configuration,
> which will corrupt DSP_A audio mode.
> 
> Reported-by: Pavel Machek <pavel@ucw.cz>
> Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
> ---
> Hi,
> 
> most of my boards are using DSP_B or I2S mode... This is why this is slipped.
> 
> Peter
> 
>  sound/soc/codecs/tlv320aic3x.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c
> index a78ad361f494..07603d142923 100644
> --- a/sound/soc/codecs/tlv320aic3x.c
> +++ b/sound/soc/codecs/tlv320aic3x.c
> @@ -1046,7 +1046,7 @@ static int aic3x_prepare(struct snd_pcm_substream *substream,
>  		delay += aic3x->tdm_delay;
>  
>  	/* Configure data delay */
> -	snd_soc_write(codec, AIC3X_ASD_INTF_CTRLC, aic3x->tdm_delay);
> +	snd_soc_write(codec, AIC3X_ASD_INTF_CTRLC, delay);
>  
>  	return 0;
>  }
> -- 
> 2.2.2
> 
> _______________________________________________
> Alsa-devel mailing list
> Alsa-devel@alsa-project.org
> http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
>
Jarkko Nikula Jan. 30, 2015, 5:50 p.m. UTC | #3
On 01/30/2015 02:52 PM, Pavel Machek wrote:
> Hi!
> 
>> Fix the issue introduced by:
>> 368494093354 ASoC: tlv320aic3x: Add TDM support
>>
>> The CTRLC register were not receiving the correct delay configuration,
>> which will corrupt DSP_A audio mode.
>>
>> Reported-by: Pavel Machek <pavel@ucw.cz>
>> Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
> 
> Tested-by: Pavel Machek <pavel@ucw.cz>
> 
You could add into v2 (see Takashi's Fixes: tag comment) also my

Tested-by: Jarkko Nikula <jarkko.nikula@bitmer.com>
diff mbox

Patch

diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c
index a78ad361f494..07603d142923 100644
--- a/sound/soc/codecs/tlv320aic3x.c
+++ b/sound/soc/codecs/tlv320aic3x.c
@@ -1046,7 +1046,7 @@  static int aic3x_prepare(struct snd_pcm_substream *substream,
 		delay += aic3x->tdm_delay;
 
 	/* Configure data delay */
-	snd_soc_write(codec, AIC3X_ASD_INTF_CTRLC, aic3x->tdm_delay);
+	snd_soc_write(codec, AIC3X_ASD_INTF_CTRLC, delay);
 
 	return 0;
 }