ASoC: wm8962: Restore device state after reset in runtime resume

Commit 9c24b1672283644adf871244771ebf387dd73f90 upstream.

After the device has been reset we need to repeat the same
initialisation we do on probe to make sure that the device is in
a known state.

Tested-by: Nicolin Chen <b42378@freescale.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>

1 files changed, 15 insertions, 0 deletions

diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c
index 2bb087c264dc..3e2a0a574f13 100644
--- a/sound/soc/codecs/wm8962.c
+++ b/sound/soc/codecs/wm8962.c
@@ -3759,6 +3759,21 @@ static int wm8962_runtime_resume(struct device *dev)
 
         wm8962_reset(wm8962);
 
+        /* SYSCLK defaults to on; make sure it is off so we can safely
+         * write to registers if the device is declocked.
+         */
+        regmap_update_bits(wm8962->regmap, WM8962_CLOCKING2,
+                           WM8962_SYSCLK_ENA, 0);
+
+        /* Ensure we have soft control over all registers */
+        regmap_update_bits(wm8962->regmap, WM8962_CLOCKING2,
+                           WM8962_CLKREG_OVD, WM8962_CLKREG_OVD);
+
+        /* Ensure that the oscillator and PLLs are disabled */
+        regmap_update_bits(wm8962->regmap, WM8962_PLL2,
+                           WM8962_OSC_ENA | WM8962_PLL2_ENA | WM8962_PLL3_ENA,
+                           0);
+
         regcache_sync(wm8962->regmap);
 
         return 0;