summaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/wm8994.c
diff options
context:
space:
mode:
authorMark Brown2012-02-12 00:10:30 +0100
committerMark Brown2012-02-12 00:11:22 +0100
commite85b26ce3a4cda67262ae6f7d918a63fd4dc153c (patch)
tree5239338c8dd15a5c0df17d46335329d811936c1b /sound/soc/codecs/wm8994.c
parentASoC: wm8994: VMID management improvements (diff)
downloadkernel-qcow2-linux-e85b26ce3a4cda67262ae6f7d918a63fd4dc153c.tar.gz
kernel-qcow2-linux-e85b26ce3a4cda67262ae6f7d918a63fd4dc153c.tar.xz
kernel-qcow2-linux-e85b26ce3a4cda67262ae6f7d918a63fd4dc153c.zip
ASoC: wm8994: Actively discharge VMID when not in use
Ensure we're in a known state when we restart. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/codecs/wm8994.c')
-rw-r--r--sound/soc/codecs/wm8994.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c
index aa94ca1f6a9b..3a69ec0d5afd 100644
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@ -838,6 +838,10 @@ static void vmid_dereference(struct snd_soc_codec *codec)
WM8994_BIAS_ENA |
WM8994_VMID_SEL_MASK, 0);
+ /* Discharge VMID */
+ snd_soc_update_bits(codec, WM8994_ANTIPOP_2,
+ WM8994_VMID_DISCH, WM8994_VMID_DISCH);
+
/* Discharge line */
snd_soc_update_bits(codec, WM8994_ANTIPOP_1,
WM8994_LINEOUT1_DISCH |