2022-06-28 16:06:04

by Charles Keepax

Subject: [PATCH 1/4] ASoC: wm5102: Fix event generation for output compensation

The output compensation controls always returns zero regardless of if
the control value was updated. This results in missing notifications
to user-space of the control change. Update the handling to return 1
when the value is changed.

Signed-off-by: Charles Keepax <[email protected]>
---
sound/soc/codecs/wm5102.c | 21 +++++++++++++++++----
1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/sound/soc/codecs/wm5102.c b/sound/soc/codecs/wm5102.c
index da2f8998df87a..b034df47a5ef1 100644
--- a/sound/soc/codecs/wm5102.c
+++ b/sound/soc/codecs/wm5102.c
@@ -680,12 +680,17 @@ static int wm5102_out_comp_coeff_put(struct snd_kcontrol *kcontrol,
{
struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
struct arizona *arizona = dev_get_drvdata(component->dev->parent);
+ uint16_t dac_comp_coeff = get_unaligned_be16(ucontrol->value.bytes.data);
+ int ret = 0;

mutex_lock(&arizona->dac_comp_lock);
- arizona->dac_comp_coeff = get_unaligned_be16(ucontrol->value.bytes.data);
+ if (arizona->dac_comp_coeff != dac_comp_coeff) {
+ arizona->dac_comp_coeff = dac_comp_coeff;
+ ret = 1;
+ }
mutex_unlock(&arizona->dac_comp_lock);

- return 0;
+ return ret;
}

static int wm5102_out_comp_switch_get(struct snd_kcontrol *kcontrol,
@@ -706,12 +711,20 @@ static int wm5102_out_comp_switch_put(struct snd_kcontrol *kcontrol,
{
struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
struct arizona *arizona = dev_get_drvdata(component->dev->parent);
+ struct soc_mixer_control *mc = (struct soc_mixer_control *)kcontrol->private_value;
+ int ret = 0;
+
+ if (ucontrol->value.integer.value[0] > mc->max)
+ return -EINVAL;

mutex_lock(&arizona->dac_comp_lock);
- arizona->dac_comp_enabled = ucontrol->value.integer.value[0];
+ if (arizona->dac_comp_enabled != ucontrol->value.integer.value[0]) {
+ arizona->dac_comp_enabled = ucontrol->value.integer.value[0];
+ ret = 1;
+ }
mutex_unlock(&arizona->dac_comp_lock);

- return 0;
+ return ret;
}

static const char * const wm5102_osr_text[] = {
--
2.30.2

2022-06-29 13:22:31

by Mark Brown

Subject: Re: [PATCH 1/4] ASoC: wm5102: Fix event generation for output compensation

On Tue, 28 Jun 2022 16:34:06 +0100, Charles Keepax wrote:
> The output compensation controls always returns zero regardless of if
> the control value was updated. This results in missing notifications
> to user-space of the control change. Update the handling to return 1
> when the value is changed.
>
>

Applied to

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

Thanks!

[1/4] ASoC: wm5102: Fix event generation for output compensation
commit: cb41d454b2478a98c831f14e656a34c21418e241
[2/4] ASoC: wm8998: Fix event generation for input mux
commit: a83f511909217a1c2b971a509c992b6327bb18e7
[3/4] ASoC: cs47l92: Fix event generation for OUT1 demux
commit: 2d81cca17329dece1c4f37d1de271bc967439327
[4/4] ASoC: arizona: Update arizona_aif_cfg_changed to use RX_BCLK_RATE
commit: 6f04f1bfe9a4adf750c816f6094878222e496d0e

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