From db4d37bdbd068fcc5dc71537b355e3d7f2adb77e Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Tue, 20 Jul 2010 10:13:14 +0100
Subject: [PATCH] --- yaml --- r: 206616 b: refs/heads/master c:
 d1ce6b200cba6bfd76e17e327b5052aa76a46abf h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/sound/soc/codecs/wm8994.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 3c55fbac469b..64f1faed5df8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 48519f0ae03bc7e86b3dc93e56f1334d53803770
+refs/heads/master: d1ce6b200cba6bfd76e17e327b5052aa76a46abf
diff --git a/trunk/sound/soc/codecs/wm8994.c b/trunk/sound/soc/codecs/wm8994.c
index 0ddb6f1ce6fb..a87046a96f2a 100644
--- a/trunk/sound/soc/codecs/wm8994.c
+++ b/trunk/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);