Unverified Commit 28b0b18d authored by Neil Armstrong's avatar Neil Armstrong Committed by Mark Brown
Browse files

ASoC: codec: wsa884x: make use of new mute_unmute_on_trigger flag 



This fix is based on commit [1] fixing click and pop sounds during
SoundWire port start because PA is left unmuted.

making use of new mute_unmute_on_trigger flag and removing unmute
at PA setup, removes the Click/Pop issue at SoundWire enable.

[1] 805ce818 ("ASoC: codecs: wsa883x: make use of new mute_unmute_on_trigger flag")

Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: default avatarNeil Armstrong <neil.armstrong@linaro.org>
Reviewed-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://msgid.link/r/20231211-topic-sm8x50-upstream-wsa884x-fix-plop-v1-1-0dc630a19172@linaro.org


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent ab8921e1

sound/soc/codecs/wsa884x.c

+1 −6
Original line number Diff line number Diff line
@@ -1654,15 +1654,9 @@ static int wsa884x_spkr_event(struct snd_soc_dapm_widget *w, 
		snd_soc_component_write_field(component, WSA884X_PDM_WD_CTL,

					      WSA884X_PDM_WD_CTL_PDM_WD_EN_MASK,

					      0x1);

		snd_soc_component_write_field(component, WSA884X_PA_FSM_EN,

					      WSA884X_PA_FSM_EN_GLOBAL_PA_EN_MASK,

					      0x1);



		break;

	case SND_SOC_DAPM_PRE_PMD:

		snd_soc_component_write_field(component, WSA884X_PA_FSM_EN,

					      WSA884X_PA_FSM_EN_GLOBAL_PA_EN_MASK,

					      0x0);

		snd_soc_component_write_field(component, WSA884X_PDM_WD_CTL,

					      WSA884X_PDM_WD_CTL_PDM_WD_EN_MASK,

					      0x0);
@@ -1786,6 +1780,7 @@ static const struct snd_soc_dai_ops wsa884x_dai_ops = { 
	.hw_free = wsa884x_hw_free,

	.mute_stream = wsa884x_mute_stream,

	.set_stream = wsa884x_set_stream,

	.mute_unmute_on_trigger = true,

};



static struct snd_soc_dai_driver wsa884x_dais[] = {