Unverified Commit 49aadf83 authored by Johan Hovold's avatar Johan Hovold Committed by Mark Brown
Browse files

ASoC: codecs: wsa883x: 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.

This avoids repeated initialisation of the codecs during boot of
machines like the Lenovo ThinkPad X13s:

[   11.614523] wsa883x-codec sdw:1:0:0217:0202:00:1: WSA883X Version 1_1, Variant: WSA8835_V2
[   11.618022] wsa883x-codec sdw:1:0:0217:0202:00:1: WSA883X Version 1_1, Variant: WSA8835_V2
[   11.621377] wsa883x-codec sdw:1:0:0217:0202:00:1: WSA883X Version 1_1, Variant: WSA8835_V2
[   11.624065] wsa883x-codec sdw:1:0:0217:0202:00:1: WSA883X Version 1_1, Variant: WSA8835_V2
[   11.631382] wsa883x-codec sdw:1:0:0217:0202:00:2: WSA883X Version 1_1, Variant: WSA8835_V2
[   11.634424] wsa883x-codec sdw:1:0:0217:0202:00:2: WSA883X Version 1_1, Variant: WSA8835_V2

Fixes: 43b8c7dc ("ASoC: codecs: add wsa883x amplifier support")
Cc: stable@vger.kernel.org	# 6.0
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-2-johan@kernel.org


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

sound/soc/codecs/wsa883x.c

+9 −0
Original line number Diff line number Diff line
@@ -475,6 +475,7 @@ struct wsa883x_priv { 
	int active_ports;

	int dev_mode;

	int comp_offset;

	bool hw_init;

	/*

	 * Protects temperature reading code (related to speaker protection) and

	 * fields: temperature and pa_on.
@@ -1043,6 +1044,9 @@ static int wsa883x_init(struct wsa883x_priv *wsa883x) 
	struct regmap *regmap = wsa883x->regmap;

	int variant, version, ret;



	if (wsa883x->hw_init)

		return 0;



	ret = regmap_read(regmap, WSA883X_OTP_REG_0, &variant);

	if (ret)

		return ret;
@@ -1085,6 +1089,8 @@ static int wsa883x_init(struct wsa883x_priv *wsa883x) 
				   wsa883x->comp_offset);

	}



	wsa883x->hw_init = true;



	return 0;

}
@@ -1093,6 +1099,9 @@ static int wsa883x_update_status(struct sdw_slave *slave, 
{

	struct wsa883x_priv *wsa883x = dev_get_drvdata(&slave->dev);



	if (status == SDW_SLAVE_UNATTACHED)

		wsa883x->hw_init = false;



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

		return wsa883x_init(wsa883x);