summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorBo Shen <voice.shen@atmel.com>2013-12-18 11:26:23 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-01-09 12:24:19 -0800
commit9231e317df6664c2d5322d66e91d641c9c0c6d02 (patch)
tree76d987bf9e6bbc34a04c47ea1f2facc2adb1caaa /sound
parent05687bd4a14b3970d1f903def34aa421634f31fe (diff)
downloadlinux-stable-9231e317df6664c2d5322d66e91d641c9c0c6d02.tar.gz
linux-stable-9231e317df6664c2d5322d66e91d641c9c0c6d02.tar.bz2
linux-stable-9231e317df6664c2d5322d66e91d641c9c0c6d02.zip
ASoC: wm8904: fix DSP mode B configuration
commit f0199bc5e3a3ec13f9bc938556517ec430b36437 upstream. When wm8904 work in DSP mode B, we still need to configure it to work in DSP mode. Or else, it will work in Right Justified mode. Signed-off-by: Bo Shen <voice.shen@atmel.com> Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com> Signed-off-by: Mark Brown <broonie@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/wm8904.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8904.c b/sound/soc/codecs/wm8904.c
index 3ff195c541db..af62f843a691 100644
--- a/sound/soc/codecs/wm8904.c
+++ b/sound/soc/codecs/wm8904.c
@@ -1449,7 +1449,7 @@ static int wm8904_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
case SND_SOC_DAIFMT_DSP_B:
- aif1 |= WM8904_AIF_LRCLK_INV;
+ aif1 |= 0x3 | WM8904_AIF_LRCLK_INV;
case SND_SOC_DAIFMT_DSP_A:
aif1 |= 0x3;
break;