summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-07-20 10:13:14 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-07-20 10:27:05 +0100
commitd1ce6b200cba6bfd76e17e327b5052aa76a46abf (patch)
tree41ec50ba58b708ce2f8f7d6c8a0cadb2b4aa50df /sound
parent48519f0ae03bc7e86b3dc93e56f1334d53803770 (diff)
downloadlinux-3.10-d1ce6b200cba6bfd76e17e327b5052aa76a46abf.tar.gz
linux-3.10-d1ce6b200cba6bfd76e17e327b5052aa76a46abf.tar.bz2
linux-3.10-d1ce6b200cba6bfd76e17e327b5052aa76a46abf.zip
ASoC: Unconditionally enable WM8994 AIF1ADC TDM mode
AIF1ADC TDM mode has no effect other than causing the ADCDAT line to be tristated rather than driven low on clock cycles where there is no data to be transmitted. If the clock cycle is idle then there should be no devices using the data so tristating should have no adverse effects. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/wm8994.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c
index 0ddb6f1ce6f..a87046a96f2 100644
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@ -4074,6 +4074,11 @@ static int wm8994_codec_probe(struct platform_device *pdev)
1 << WM8994_AIF2DAC_3D_GAIN_SHIFT,
1 << WM8994_AIF2DAC_3D_GAIN_SHIFT);
+ /* Unconditionally enable AIF1 ADC TDM mode; it only affects
+ * behaviour on idle TDM clock cycles. */
+ snd_soc_update_bits(codec, WM8994_AIF1_CONTROL_1,
+ WM8994_AIF1ADC_TDM, WM8994_AIF1ADC_TDM);
+
wm8994_update_class_w(codec);
ret = snd_soc_register_codec(codec);