summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-07-01 17:24:46 -0700
committerAndi Kleen <ak@linux.intel.com>2011-08-01 13:55:04 -0700
commit507e949027b3dc00f56a1c91b88c2d899e9eaea0 (patch)
treec35420a3e85b4217ef8b7545000827571e36c4e2
parent64779cb190a6ba7a03b658cd0584cef74fb9c208 (diff)
downloadkernel-common-507e949027b3dc00f56a1c91b88c2d899e9eaea0.tar.gz
kernel-common-507e949027b3dc00f56a1c91b88c2d899e9eaea0.tar.bz2
kernel-common-507e949027b3dc00f56a1c91b88c2d899e9eaea0.zip
ASoC: Ensure we delay long enough for WM8994 FLL to lock
[ upstream commit 8e9ddf811ba021506d2316fcfe619faa0ab3f567 ] when starting This delay is very conservative. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Liam Girdwood <lrg@ti.com> Cc: stable@kernel.org Signed-off-by: Andi Kleen <ak@linux.intel.com>
-rw-r--r--sound/soc/codecs/wm8994.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c
index e84a1177f350..b458dc736921 100644
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@ -2929,6 +2929,8 @@ static int wm8994_set_fll(struct snd_soc_dai *dai, 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;