From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Sat, 2 Jul 2011 00:24:46 +0000 (-0700)
Subject: ASoC: Ensure we delay long enough for WM8994 FLL to lock when starting
X-Git-Tag: v2.6.39.4~60
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=27c1e50b83622a07bb39ccbf1c332e476e1a0cd8;p=thirdparty%2Fkernel%2Fstable.git

ASoC: Ensure we delay long enough for WM8994 FLL to lock when starting

commit 8e9ddf811ba021506d2316fcfe619faa0ab3f567 upstream.

This delay is very conservative.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c
index 84e1bd1d2822f..fece9d9696b8a 100644
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@ -1969,6 +1969,8 @@ static int _wm8994_set_fll(struct snd_soc_codec *codec, int id, int src,
 		snd_soc_update_bits(codec, WM8994_FLL1_CONTROL_1 + reg_offset,
 				    WM8994_FLL1_ENA | WM8994_FLL1_FRAC,
 				    reg);
+
+		msleep(5);
 	}
 
 	wm8994->fll[id].in = freq_in;