Unverified Commit 29d71b8a authored by Johan Hovold's avatar Johan Hovold Committed by Mark Brown
Browse files

ASoC: codecs: wsa881x: fix unnecessary initialisation 



The soundwire update_status() callback may be called multiple times with
the same ATTACHED status but initialisation should only be done when
transitioning from UNATTACHED to ATTACHED.

Fixes: a0aab9e1 ("ASoC: codecs: add wsa881x amplifier support")
Cc: stable@vger.kernel.org	# 5.6
Cc: Srinivas Kandagatla <srini@kernel.org>
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Reviewed-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>
Reviewed-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
Link: https://patch.msgid.link/20260102111413.9605-3-johan@kernel.org


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

sound/soc/codecs/wsa881x.c

+9 −0
Original line number Diff line number Diff line
@@ -678,6 +678,7 @@ struct wsa881x_priv { 
	 */

	unsigned int sd_n_val;

	int active_ports;

	bool hw_init;

	bool port_prepared[WSA881X_MAX_SWR_PORTS];

	bool port_enable[WSA881X_MAX_SWR_PORTS];

};
@@ -687,6 +688,9 @@ static void wsa881x_init(struct wsa881x_priv *wsa881x) 
	struct regmap *rm = wsa881x->regmap;

	unsigned int val = 0;



	if (wsa881x->hw_init)

		return;



	regmap_register_patch(wsa881x->regmap, wsa881x_rev_2_0,

			      ARRAY_SIZE(wsa881x_rev_2_0));
@@ -724,6 +728,8 @@ static void wsa881x_init(struct wsa881x_priv *wsa881x) 
	regmap_update_bits(rm, WSA881X_OTP_REG_28, 0x3F, 0x3A);

	regmap_update_bits(rm, WSA881X_BONGO_RESRV_REG1, 0xFF, 0xB2);

	regmap_update_bits(rm, WSA881X_BONGO_RESRV_REG2, 0xFF, 0x05);



	wsa881x->hw_init = true;

}



static int wsa881x_component_probe(struct snd_soc_component *comp)
@@ -1067,6 +1073,9 @@ static int wsa881x_update_status(struct sdw_slave *slave, 
{

	struct wsa881x_priv *wsa881x = dev_get_drvdata(&slave->dev);



	if (status == SDW_SLAVE_UNATTACHED)

		wsa881x->hw_init = false;



	if (status == SDW_SLAVE_ATTACHED && slave->dev_num > 0)

		wsa881x_init(wsa881x);