Merge remote-tracking branch 'asoc/topic/wm8962' into asoc-next

[linux-2.6-block.git] / sound / soc / codecs / wm8962.c

diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c
index dfaf592d2fc9e286ecf61b00d9e0aafcb3d827ea..b1dc7d4264385f9f67ca9df57d15f33c88b09add 100644 (file)
--- a/sound/soc/codecs/wm8962.c
+++ b/sound/soc/codecs/wm8962.c
@@ -3775,6 +3775,17 @@ static int wm8962_runtime_resume(struct device *dev)
 
        regcache_sync(wm8962->regmap);
 
+       regmap_update_bits(wm8962->regmap, WM8962_ANTI_POP,
+                          WM8962_STARTUP_BIAS_ENA | WM8962_VMID_BUF_ENA,
+                          WM8962_STARTUP_BIAS_ENA | WM8962_VMID_BUF_ENA);
+
+       /* Bias enable at 2*5k (fast start-up) */
+       regmap_update_bits(wm8962->regmap, WM8962_PWR_MGMT_1,
+                          WM8962_BIAS_ENA | WM8962_VMID_SEL_MASK,
+                          WM8962_BIAS_ENA | 0x180);
+
+       msleep(5);
+
        return 0;
 }