[PATCH RESEND 3/4] ASoC: wm8962: Don't report a microphone if it's shorted to ground on plug

Sebastian Krzyszkowiak via B4 Relay posted 4 patches 2 days, 20 hours ago
[PATCH RESEND 3/4] ASoC: wm8962: Don't report a microphone if it's shorted to ground on plug
Posted by Sebastian Krzyszkowiak via B4 Relay 2 days, 20 hours ago
From: Sebastian Krzyszkowiak <sebastian.krzyszkowiak@puri.sm>

This usually means that a TRS plug with no microphone pin has been plugged
into a TRRS socket. Cases where a user is plugging in a microphone while
pressing a button will be handled via incoming interrupt after the user
releases the button, so the microphone will still be detected once it
becomes usable.

Signed-off-by: Sebastian Krzyszkowiak <sebastian.krzyszkowiak@puri.sm>
---
 sound/soc/codecs/wm8962.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c
index 843b8c6b40a4..dd73b4dc1b97 100644
--- a/sound/soc/codecs/wm8962.c
+++ b/sound/soc/codecs/wm8962.c
@@ -67,6 +67,8 @@ struct wm8962_priv {
 	struct mutex dsp2_ena_lock;
 	u16 dsp2_ena;
 
+	int mic_status;
+
 	struct delayed_work mic_work;
 	struct snd_soc_jack *jack;
 
@@ -3082,8 +3084,16 @@ static void wm8962_mic_work(struct work_struct *work)
 	if (reg & WM8962_MICSHORT_STS) {
 		status |= SND_JACK_BTN_0;
 		irq_pol |= WM8962_MICSCD_IRQ_POL;
+
+		/* Don't report a microphone if it's shorted right after
+		 * plugging in, as this may be a TRS plug in a TRRS socket.
+		 */
+		if (!(wm8962->mic_status & WM8962_MICDET_STS))
+			status = 0;
 	}
 
+	wm8962->mic_status = status;
+
 	snd_soc_jack_report(wm8962->jack, status,
 			    SND_JACK_MICROPHONE | SND_JACK_BTN_0);
 

-- 
2.52.0
Re: [PATCH RESEND 3/4] ASoC: wm8962: Don't report a microphone if it's shorted to ground on plug
Posted by Charles Keepax 1 day, 9 hours ago
On Mon, Jan 05, 2026 at 04:02:10AM +0100, Sebastian Krzyszkowiak via B4 Relay wrote:
> From: Sebastian Krzyszkowiak <sebastian.krzyszkowiak@puri.sm>
> 
> This usually means that a TRS plug with no microphone pin has been plugged
> into a TRRS socket. Cases where a user is plugging in a microphone while
> pressing a button will be handled via incoming interrupt after the user
> releases the button, so the microphone will still be detected once it
> becomes usable.
> 
> Signed-off-by: Sebastian Krzyszkowiak <sebastian.krzyszkowiak@puri.sm>
> ---

Reviewed-by: Charles Keepax <ckeepax@opensource.cirrus.com>

Thanks,
Charles