aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-12-14 11:25:18 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-12-14 18:10:39 +0000
commit83b6542533859d6ed6c95f8b869291e885eab5bd (patch)
tree570922e09db950ae17022cfb5a97b3a436159665
parentASoC: dapm: Add output driver widget (diff)
downloadlinux-dev-83b6542533859d6ed6c95f8b869291e885eab5bd.tar.xz
linux-dev-83b6542533859d6ed6c95f8b869291e885eab5bd.zip
ASoC: Explicitly clear WM8993 ramp controls on power down
This helps ensure that the ramp logic is reset when powering back up. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
-rw-r--r--sound/soc/codecs/wm8993.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm8993.c b/sound/soc/codecs/wm8993.c
index 77b1d441c3d0..15f34a26debf 100644
--- a/sound/soc/codecs/wm8993.c
+++ b/sound/soc/codecs/wm8993.c
@@ -1030,6 +1030,12 @@ static int wm8993_set_bias_level(struct snd_soc_codec *codec,
WM8993_VMID_SEL_MASK | WM8993_BIAS_ENA,
0);
+ snd_soc_update_bits(codec, WM8993_ANTIPOP2,
+ WM8993_STARTUP_BIAS_ENA |
+ WM8993_VMID_BUF_ENA |
+ WM8993_VMID_RAMP_MASK |
+ WM8993_BIAS_SRC, 0);
+
#ifdef CONFIG_REGULATOR
/* Post 2.6.34 we will be able to get a callback when
* the regulators are disabled which we can use but