summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-07-01 17:24:46 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2011-08-03 12:42:26 -0700
commit27c1e50b83622a07bb39ccbf1c332e476e1a0cd8 (patch)
treeacaf91da820ffb3a0e86c8ac8e5cb7fc13a90871 /sound
parent34396acf40adf67140aa163cb7e6efe9d366d8e6 (diff)
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>
Diffstat (limited to 'sound')
-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 84e1bd1d2822..fece9d9696b8 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;