]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
ASoC: ad193x: fix dac word len setting
authorScott Jiang <scott.jiang.linux@gmail.com>
Fri, 12 Aug 2011 22:04:11 +0000 (18:04 -0400)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 15 Aug 2011 13:29:22 +0000 (22:29 +0900)
dac word len value should left shift before setting

Signed-off-by: Scott Jiang <scott.jiang.linux@gmail.com>
Acked-by: Barry Song <21cnbao@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: stable@kernel.org
sound/soc/codecs/ad193x.c
sound/soc/codecs/ad193x.h

index 2374ca5ffe68bacc6c37db16be249858fb17fad2..f1a8be58255b010850e92f08b0defe30d05541c2 100644 (file)
@@ -307,7 +307,8 @@ static int ad193x_hw_params(struct snd_pcm_substream *substream,
        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);
index c1029d242c84a4f2eef2f804f1885bd4f5273c00..cccc2e8e5fbd3e830a3a402ed565a2c981ad7f2b 100644 (file)
@@ -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