aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-07-30 18:24:19 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-08-09 08:27:53 -0700
commit4ae4c20ceb593c1a8f392bb1100cc60a1f04ee4c (patch)
tree373b50e5168307429e2b901cbeb729441fecb42f
parentde4bc9fc942526dbcb0246dbb2ca87ad9b3b02b0 (diff)
downloadlinux-linaro-stable-4ae4c20ceb593c1a8f392bb1100cc60a1f04ee4c.tar.gz
ASoC: wm8962: Allow VMID time to fully ramp
commit 9d40e5582c9c4cfb6977ba2a0ca9c2ed82c56f21 upstream. Required for reliable power up from cold. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--sound/soc/codecs/wm8962.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c
index c850e3d84ed0..f16f587dfb0e 100644
--- a/sound/soc/codecs/wm8962.c
+++ b/sound/soc/codecs/wm8962.c
@@ -2890,6 +2890,9 @@ static int wm8962_set_bias_level(struct snd_soc_codec *codec,
/* VMID 2*250k */
snd_soc_update_bits(codec, WM8962_PWR_MGMT_1,
WM8962_VMID_SEL_MASK, 0x100);
+
+ if (codec->dapm.bias_level == SND_SOC_BIAS_OFF)
+ msleep(100);
break;
case SND_SOC_BIAS_OFF: