Re: [PATCH] ASoC: cpcap: Fix event generation for mux controls

From: Mark Brown

Date: Tue Dec 02 2025 - 09:10:54 EST


On Mon, Dec 01, 2025 at 11:03:54AM +0800, Haotian Zhang wrote:

> - err = regmap_update_bits(cpcap->regmap, CPCAP_REG_RXCOA,
> - mask, reg_voice);
> + err = regmap_update_bits_check(cpcap->regmap, CPCAP_REG_RXCOA,
> + mask, reg_voice, &change);
> if (err)
> return err;
> - err = regmap_update_bits(cpcap->regmap, CPCAP_REG_RXSDOA,
> - mask, reg_hifi);
> + err = regmap_update_bits_check(cpcap->regmap, CPCAP_REG_RXSDOA,
> + mask, reg_hifi, &change);
> if (err)
> return err;
> - err = regmap_update_bits(cpcap->regmap, CPCAP_REG_RXEPOA,
> - mask, reg_ext);
> + err = regmap_update_bits_check(cpcap->regmap, CPCAP_REG_RXEPOA,
> + mask, reg_ext, &change);

This will only flag a change if it happens as part of the last update,
each regmap call will overwrite the change flag.

> if (err)
> return err;
>
> snd_soc_dapm_mux_update_power(dapm, kcontrol, muxval, e, NULL);
>
> - return 0;
> + return change ? 1 : 0;
> }
>
> static int cpcap_input_right_mux_get_enum(struct snd_kcontrol *kcontrol,
> @@ -515,6 +516,7 @@ static int cpcap_input_right_mux_put_enum(struct snd_kcontrol *kcontrol,
> unsigned int muxval = ucontrol->value.enumerated.item[0];
> int regval = 0, mask;
> int err;
> + bool change = false;
>
> mask = 0;
> mask |= BIT(CPCAP_BIT_MIC1_MUX);
> @@ -539,14 +541,14 @@ static int cpcap_input_right_mux_put_enum(struct snd_kcontrol *kcontrol,
> break;
> }
>
> - err = regmap_update_bits(cpcap->regmap, CPCAP_REG_TXI,
> - mask, regval);
> + err = regmap_update_bits_check(cpcap->regmap, CPCAP_REG_TXI,
> + mask, regval, &change);
> if (err)
> return err;
>
> snd_soc_dapm_mux_update_power(dapm, kcontrol, muxval, e, NULL);
>
> - return 0;
> + return change ? 1 : 0;
> }
>
> static int cpcap_input_left_mux_get_enum(struct snd_kcontrol *kcontrol,
> @@ -591,6 +593,7 @@ static int cpcap_input_left_mux_put_enum(struct snd_kcontrol *kcontrol,
> unsigned int muxval = ucontrol->value.enumerated.item[0];
> int regval = 0, mask;
> int err;
> + bool change = false;
>
> mask = 0;
> mask |= BIT(CPCAP_BIT_MIC2_MUX);
> @@ -607,14 +610,14 @@ static int cpcap_input_left_mux_put_enum(struct snd_kcontrol *kcontrol,
> break;
> }
>
> - err = regmap_update_bits(cpcap->regmap, CPCAP_REG_TXI,
> - mask, regval);
> + err = regmap_update_bits_check(cpcap->regmap, CPCAP_REG_TXI,
> + mask, regval, &change);
> if (err)
> return err;
>
> snd_soc_dapm_mux_update_power(dapm, kcontrol, muxval, e, NULL);
>
> - return 0;
> + return change ? 1 : 0;
> }
>
> static const struct snd_kcontrol_new cpcap_input_left_mux =
> --
> 2.50.1.windows.1
>

Attachment: signature.asc
Description: PGP signature