[PATCH RESEND 0/4] sound: codecs: wm8962: Assorted fixes

[PATCH RESEND 0/4] sound: codecs: wm8962: Assorted fixes

[Sebastian Krzyszkowiak via B4 Relay]

Bunch of patches developed while working on Purism's Librem 5 phone.

Signed-off-by: Sebastian Krzyszkowiak <sebastian.krzyszkowiak@puri.sm>
---
Sebastian Krzyszkowiak (4):
      ASoC: wm8962: Add WM8962_ADC_MONOMIX to "3D Coefficients" mask
      ASoC: wm8962: Don't disable SYSCLK if it's enabled via DAPM
      ASoC: wm8962: Don't report a microphone if it's shorted to ground on plug
      ASoC: wm8962: Don't mark WM8962_ADDITIONAL_CONTROL_4 as volatile

 sound/soc/codecs/wm8962.c | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)
---
base-commit: 9ace4753a5202b02191d54e9fdf7f9e3d02b85eb
change-id: 20260105-wm8962-l5-fixes-8cde049eb67d

Best regards,
-- 
Sebastian Krzyszkowiak <sebastian.krzyszkowiak@puri.sm>

[PATCH RESEND 1/4] ASoC: wm8962: Add WM8962_ADC_MONOMIX to "3D Coefficients" mask

[Sebastian Krzyszkowiak via B4 Relay]

From: Sebastian Krzyszkowiak <sebastian.krzyszkowiak@puri.sm>

This bit is handled by a separate control.

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

diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c
index e9e317ce6898..1040740fc80f 100644
--- a/sound/soc/codecs/wm8962.c
+++ b/sound/soc/codecs/wm8962.c
@@ -1760,7 +1760,7 @@ SND_SOC_BYTES("EQR Coefficients", WM8962_EQ24, 18),
 
 
 SOC_SINGLE("3D Switch", WM8962_THREED1, 0, 1, 0),
-SND_SOC_BYTES_MASK("3D Coefficients", WM8962_THREED1, 4, WM8962_THREED_ENA),
+SND_SOC_BYTES_MASK("3D Coefficients", WM8962_THREED1, 4, WM8962_THREED_ENA | WM8962_ADC_MONOMIX),
 
 SOC_SINGLE("DF1 Switch", WM8962_DF1, 0, 1, 0),
 SND_SOC_BYTES_MASK("DF1 Coefficients", WM8962_DF1, 7, WM8962_DF1_ENA),

-- 
2.52.0

Re: [PATCH RESEND 1/4] ASoC: wm8962: Add WM8962_ADC_MONOMIX to "3D Coefficients" mask

[Charles Keepax]

On Mon, Jan 05, 2026 at 04:02:08AM +0100, Sebastian Krzyszkowiak via B4 Relay wrote:
> From: Sebastian Krzyszkowiak <sebastian.krzyszkowiak@puri.sm>
> 
> This bit is handled by a separate control.
> 
> Signed-off-by: Sebastian Krzyszkowiak <sebastian.krzyszkowiak@puri.sm>
> ---

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

Thanks,
Charles

[PATCH RESEND 2/4] ASoC: wm8962: Don't disable SYSCLK if it's enabled via DAPM

[Sebastian Krzyszkowiak via B4 Relay]

From: Sebastian Krzyszkowiak <sebastian.krzyszkowiak@puri.sm>

If SYSCLK pin is enabled via DAPM, wm8962_configure_bclk may turn it off
behind DAPM's back, making it assume that the clock is still enabled even
if it actually isn't, which can end up with it not being enabled for
playback or capture when it's needed.

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

diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c
index 1040740fc80f..843b8c6b40a4 100644
--- a/sound/soc/codecs/wm8962.c
+++ b/sound/soc/codecs/wm8962.c
@@ -2520,7 +2520,8 @@ static void wm8962_configure_bclk(struct snd_soc_component *component)
 	usleep_range(500, 1000);
 	dspclk = snd_soc_component_read(component, WM8962_CLOCKING1);
 
-	if (snd_soc_dapm_get_bias_level(dapm) != SND_SOC_BIAS_ON)
+	if (snd_soc_dapm_get_bias_level(dapm) != SND_SOC_BIAS_ON
+	    && !snd_soc_dapm_get_pin_status(dapm, "SYSCLK"))
 		snd_soc_component_update_bits(component, WM8962_CLOCKING2,
 				WM8962_SYSCLK_ENA_MASK, 0);
 

-- 
2.52.0

Re: [PATCH RESEND 2/4] ASoC: wm8962: Don't disable SYSCLK if it's enabled via DAPM

[Charles Keepax]

On Mon, Jan 05, 2026 at 04:02:09AM +0100, Sebastian Krzyszkowiak via B4 Relay wrote:
> From: Sebastian Krzyszkowiak <sebastian.krzyszkowiak@puri.sm>
> 
> If SYSCLK pin is enabled via DAPM, wm8962_configure_bclk may turn it off
> behind DAPM's back, making it assume that the clock is still enabled even
> if it actually isn't, which can end up with it not being enabled for
> playback or capture when it's needed.
> 
> Signed-off-by: Sebastian Krzyszkowiak <sebastian.krzyszkowiak@puri.sm>
> ---
>  sound/soc/codecs/wm8962.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c
> index 1040740fc80f..843b8c6b40a4 100644
> --- a/sound/soc/codecs/wm8962.c
> +++ b/sound/soc/codecs/wm8962.c
> @@ -2520,7 +2520,8 @@ static void wm8962_configure_bclk(struct snd_soc_component *component)
>  	usleep_range(500, 1000);
>  	dspclk = snd_soc_component_read(component, WM8962_CLOCKING1);
>  
> -	if (snd_soc_dapm_get_bias_level(dapm) != SND_SOC_BIAS_ON)
> +	if (snd_soc_dapm_get_bias_level(dapm) != SND_SOC_BIAS_ON
> +	    && !snd_soc_dapm_get_pin_status(dapm, "SYSCLK"))

Something seems a little weird here. I guess SYSCLK is a supply
widget, so it can technically be on before the card bias level is
fully on. But SYSCLK usually supplies other widgets that would
require the bias to be fully on, so what causes it to be on? Or
is this a transitional state as things are powering up?

Thanks,
Charles

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

[Sebastian Krzyszkowiak via B4 Relay]

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

[Charles Keepax]

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

[PATCH RESEND 4/4] ASoC: wm8962: Don't mark WM8962_ADDITIONAL_CONTROL_4 as volatile

[Sebastian Krzyszkowiak via B4 Relay]

From: Sebastian Krzyszkowiak <sebastian.krzyszkowiak@puri.sm>

Only some bits of that register are actually volatile, so to prevent issues
with caching let's simply bypass the cache explicitly when we access these
particular bits.

This fixes mic-cfg value not being reapplied after runtime resume.

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

diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c
index dd73b4dc1b97..22101284c095 100644
--- a/sound/soc/codecs/wm8962.c
+++ b/sound/soc/codecs/wm8962.c
@@ -793,7 +793,6 @@ static bool wm8962_volatile_register(struct device *dev, unsigned int reg)
 	case WM8962_CLOCKING1:
 	case WM8962_SOFTWARE_RESET:
 	case WM8962_THERMAL_SHUTDOWN_STATUS:
-	case WM8962_ADDITIONAL_CONTROL_4:
 	case WM8962_DC_SERVO_6:
 	case WM8962_INTERRUPT_STATUS_1:
 	case WM8962_INTERRUPT_STATUS_2:
@@ -3074,7 +3073,9 @@ static void wm8962_mic_work(struct work_struct *work)
 	int irq_pol = 0;
 	int reg;
 
+	regcache_cache_bypass(wm8962->regmap, true);
 	reg = snd_soc_component_read(component, WM8962_ADDITIONAL_CONTROL_4);
+	regcache_cache_bypass(wm8962->regmap, false);
 
 	if (reg & WM8962_MICDET_STS) {
 		status |= SND_JACK_MICROPHONE;

-- 
2.52.0

Re: [PATCH RESEND 4/4] ASoC: wm8962: Don't mark WM8962_ADDITIONAL_CONTROL_4 as volatile

[Charles Keepax]

On Mon, Jan 05, 2026 at 04:02:11AM +0100, Sebastian Krzyszkowiak via B4 Relay wrote:
> From: Sebastian Krzyszkowiak <sebastian.krzyszkowiak@puri.sm>
> 
> Only some bits of that register are actually volatile, so to prevent issues
> with caching let's simply bypass the cache explicitly when we access these
> particular bits.
> 
> This fixes mic-cfg value not being reapplied after runtime resume.
> 
> Signed-off-by: Sebastian Krzyszkowiak <sebastian.krzyszkowiak@puri.sm>
> ---
>  sound/soc/codecs/wm8962.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c
> index dd73b4dc1b97..22101284c095 100644
> --- a/sound/soc/codecs/wm8962.c
> +++ b/sound/soc/codecs/wm8962.c
> @@ -793,7 +793,6 @@ static bool wm8962_volatile_register(struct device *dev, unsigned int reg)
>  	case WM8962_CLOCKING1:
>  	case WM8962_SOFTWARE_RESET:
>  	case WM8962_THERMAL_SHUTDOWN_STATUS:
> -	case WM8962_ADDITIONAL_CONTROL_4:
>  	case WM8962_DC_SERVO_6:
>  	case WM8962_INTERRUPT_STATUS_1:
>  	case WM8962_INTERRUPT_STATUS_2:
> @@ -3074,7 +3073,9 @@ static void wm8962_mic_work(struct work_struct *work)
>  	int irq_pol = 0;
>  	int reg;
>  
> +	regcache_cache_bypass(wm8962->regmap, true);
>  	reg = snd_soc_component_read(component, WM8962_ADDITIONAL_CONTROL_4);
> +	regcache_cache_bypass(wm8962->regmap, false);

Ah the glory of registers with a mix of configuration and status
bits, love those :-)

Alas I don't think this is safe, the trouble is the cache bypass
applies to the whole register map, so any alsa control write can
slip into the window where you have the cache bypassed and
accidentally be done as a bypassed write.

Fortunately, Richard added a regmap_read_bypassed() fairly recently
which does everything under the regmap lock, so update to use
that and you should be good.

Thanks,
Charles

Re: [PATCH RESEND 0/4] sound: codecs: wm8962: Assorted fixes

[Sebastian Krzyszkowiak]

On poniedziałek, 5 stycznia 2026 04:02:07 czas środkowoeuropejski standardowy 
Sebastian Krzyszkowiak via B4 Relay wrote:
> Bunch of patches developed while working on Purism's Librem 5 phone.
> 
> Signed-off-by: Sebastian Krzyszkowiak <sebastian.krzyszkowiak@puri.sm>
> ---
> Sebastian Krzyszkowiak (4):
>       ASoC: wm8962: Add WM8962_ADC_MONOMIX to "3D Coefficients" mask
>       ASoC: wm8962: Don't disable SYSCLK if it's enabled via DAPM
>       ASoC: wm8962: Don't report a microphone if it's shorted to ground on
> plug ASoC: wm8962: Don't mark WM8962_ADDITIONAL_CONTROL_4 as volatile
> 
>  sound/soc/codecs/wm8962.c | 18 +++++++++++++++---
>  1 file changed, 15 insertions(+), 3 deletions(-)
> ---
> base-commit: 9ace4753a5202b02191d54e9fdf7f9e3d02b85eb
> change-id: 20260105-wm8962-l5-fixes-8cde049eb67d
> 
> Best regards,

Sorry for an instant resend - this is the exact same content as the original 
patchset that at first appeared to me as if its sending has failed, so I 
retried through the B4 relay just to see them both going through... Please 
ignore the extra copy.

Thanks and happy New Year,
Sebastian

Re: (subset) [PATCH RESEND 0/4] sound: codecs: wm8962: Assorted fixes

[Mark Brown]

On Mon, 05 Jan 2026 04:02:07 +0100, Sebastian Krzyszkowiak wrote:
> Bunch of patches developed while working on Purism's Librem 5 phone.
> 
> 

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/4] ASoC: wm8962: Add WM8962_ADC_MONOMIX to "3D Coefficients" mask
      commit: 66c26346ae30c883eef70acf9cf9054dfdb4fb2f
[3/4] ASoC: wm8962: Don't report a microphone if it's shorted to ground on plug
      commit: e590752119029d87ce46d725e11245a52d22e1fe

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark