summaryrefslogtreecommitdiff
path: root/sound/soc
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-07-01 17:24:46 -0700
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-07-04 08:51:44 -0700
commit8e9ddf811ba021506d2316fcfe619faa0ab3f567 (patch)
tree51e96fd7380b3576c52f87d7f80f410bf9d14500 /sound/soc
parent713d1369789f2a2336c3431b15276c968862bdb7 (diff)
downloadlinux-3.10-8e9ddf811ba021506d2316fcfe619faa0ab3f567.tar.gz
linux-3.10-8e9ddf811ba021506d2316fcfe619faa0ab3f567.tar.bz2
linux-3.10-8e9ddf811ba021506d2316fcfe619faa0ab3f567.zip
ASoC: Ensure we delay long enough for WM8994 FLL to lock 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
Diffstat (limited to 'sound/soc')
-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 970a95c5360..c2fc0356c2a 100644
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@ -1713,6 +1713,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;