Commit 55a27786 authored by Mark Brown's avatar Mark Brown

ASoC: wm8994: Actively discharge idle MICBIAS with jack detect

This minimises the chance of any external capacitors that are fitted
being discharged into headphones as they insert.
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 29fdc360
...@@ -3224,6 +3224,9 @@ static irqreturn_t wm1811_jackdet_irq(int irq, void *data) ...@@ -3224,6 +3224,9 @@ static irqreturn_t wm1811_jackdet_irq(int irq, void *data)
snd_soc_jack_report(wm8994->micdet[0].jack, snd_soc_jack_report(wm8994->micdet[0].jack,
SND_JACK_MECHANICAL, SND_JACK_MECHANICAL); SND_JACK_MECHANICAL, SND_JACK_MECHANICAL);
snd_soc_update_bits(codec, WM8958_MICBIAS2,
WM8958_MICB2_DISCH, 0);
/* /*
* Start off measument of microphone impedence to find * Start off measument of microphone impedence to find
* out what's actually there. * out what's actually there.
...@@ -3235,6 +3238,9 @@ static irqreturn_t wm1811_jackdet_irq(int irq, void *data) ...@@ -3235,6 +3238,9 @@ static irqreturn_t wm1811_jackdet_irq(int irq, void *data)
} else { } else {
dev_dbg(codec->dev, "Jack not detected\n"); dev_dbg(codec->dev, "Jack not detected\n");
snd_soc_update_bits(codec, WM8958_MICBIAS2,
WM8958_MICB2_DISCH, WM8958_MICB2_DISCH);
snd_soc_jack_report(wm8994->micdet[0].jack, 0, snd_soc_jack_report(wm8994->micdet[0].jack, 0,
SND_JACK_MECHANICAL | SND_JACK_HEADSET | SND_JACK_MECHANICAL | SND_JACK_HEADSET |
wm8994->btn_mask); wm8994->btn_mask);
...@@ -3320,6 +3326,9 @@ int wm8958_mic_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack, ...@@ -3320,6 +3326,9 @@ int wm8958_mic_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack,
* otherwise jump straight to microphone detection. * otherwise jump straight to microphone detection.
*/ */
if (wm8994->jackdet) { if (wm8994->jackdet) {
snd_soc_update_bits(codec, WM8958_MICBIAS2,
WM8958_MICB2_DISCH,
WM8958_MICB2_DISCH);
snd_soc_update_bits(codec, WM8994_LDO_1, snd_soc_update_bits(codec, WM8994_LDO_1,
WM8994_LDO1_DISCH, 0); WM8994_LDO1_DISCH, 0);
wm1811_jackdet_set_mode(codec, wm1811_jackdet_set_mode(codec,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment