This is a note to let you know that I've just added the patch titled
ASoC: ad193x: fix dac word len setting
to the 3.0-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
asoc-ad193x-fix-dac-word-len-setting.patch
and it can be found in the queue-3.0 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <sta...@kernel.org> know about it.
>From 95c93d8525ebce1024bda7316f602ae45c36cd6f Mon Sep 17 00:00:00 2001
From: Scott Jiang <scott.jiang.li...@gmail.com>
Date: Fri, 12 Aug 2011 18:04:11 -0400
Subject: ASoC: ad193x: fix dac word len setting
From: Scott Jiang <scott.jiang.li...@gmail.com>
commit 95c93d8525ebce1024bda7316f602ae45c36cd6f upstream.
dac word len value should left shift before setting
Signed-off-by: Scott Jiang <scott.jiang.li...@gmail.com>
Acked-by: Barry Song <21cn...@gmail.com>
Signed-off-by: Mark Brown <broo...@opensource.wolfsonmicro.com>
Signed-off-by: Greg Kroah-Hartman <gre...@suse.de>
---
sound/soc/codecs/ad193x.c | 3 ++-
sound/soc/codecs/ad193x.h | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
--- a/sound/soc/codecs/ad193x.c
+++ b/sound/soc/codecs/ad193x.c
@@ -307,7 +307,8 @@ static int ad193x_hw_params(struct snd_p
snd_soc_write(codec, AD193X_PLL_CLK_CTRL0, reg);
reg = snd_soc_read(codec, AD193X_DAC_CTRL2);
- reg = (reg & (~AD193X_DAC_WORD_LEN_MASK)) | word_len;
+ reg = (reg & (~AD193X_DAC_WORD_LEN_MASK))
+ | (word_len << AD193X_DAC_WORD_LEN_SHFT);
snd_soc_write(codec, AD193X_DAC_CTRL2, reg);
reg = snd_soc_read(codec, AD193X_ADC_CTRL1);
--- a/sound/soc/codecs/ad193x.h
+++ b/sound/soc/codecs/ad193x.h
@@ -34,6 +34,7 @@
#define AD193X_DAC_LEFT_HIGH (1 << 3)
#define AD193X_DAC_BCLK_INV (1 << 7)
#define AD193X_DAC_CTRL2 0x804
+#define AD193X_DAC_WORD_LEN_SHFT 3
#define AD193X_DAC_WORD_LEN_MASK 0x18
#define AD193X_DAC_MASTER_MUTE 1
#define AD193X_DAC_CHNL_MUTE 0x805
Patches currently in stable-queue which might be from
scott.jiang.li...@gmail.com are
queue-3.0/asoc-ad193x-fix-registers-definition.patch
queue-3.0/asoc-ad193x-fix-dac-word-len-setting.patch
_______________________________________________
stable mailing list
stable@linux.kernel.org
http://linux.kernel.org/mailman/listinfo/stable
