aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-07-30 13:24:19 -0400
committerLuis Henriques <luis.henriques@canonical.com>2012-08-13 09:10:39 -0400
commit3170705e2a74fe4f052157e8ccf152fba378cc62 (patch)
treebcb7b0fb76d8bd2e90798b7f14bc99261f17f967 /sound/soc/codecs
parent1a1665e669a8193373156b815b06e0f9d0b2cf69 (diff)
ASoC: wm8962: Allow VMID time to fully ramp
BugLink: http://bugs.launchpad.net/bugs/1034988 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> Signed-off-by: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com>
Diffstat (limited to 'sound/soc/codecs')
-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 c850e3d84ed..f16f587dfb0 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,
2890 /* VMID 2*250k */ 2890 /* VMID 2*250k */
2891 snd_soc_update_bits(codec, WM8962_PWR_MGMT_1, 2891 snd_soc_update_bits(codec, WM8962_PWR_MGMT_1,
2892 WM8962_VMID_SEL_MASK, 0x100); 2892 WM8962_VMID_SEL_MASK, 0x100);
2893
2894 if (codec->dapm.bias_level == SND_SOC_BIAS_OFF)
2895 msleep(100);
2893 break; 2896 break;
2894 2897
2895 case SND_SOC_BIAS_OFF: 2898 case SND_SOC_BIAS_OFF: