ASoC: codecs: wsa883x: fix unnecessary initialisation

[ Upstream commit 49aadf830eb048134d33ad7329d92ecff45d8dbb ]

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: 43b8c7dc85a1 ("ASoC: codecs: add wsa883x amplifier support")
Cc: stable@vger.kernel.org	# 6.0
Cc: Srinivas Kandagatla <srini@kernel.org>
Signed-off-by: Johan Hovold <johan@kernel.org>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>
Reviewed-by: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
Link: https://patch.msgid.link/20260102111413.9605-2-johan@kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>
[ Adjust context ]
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/sound/soc/codecs/wsa883x.c b/sound/soc/codecs/wsa883x.c
index 639fb77170ac80f350673f8bb5d7507dfd65aaa0..94ac6729cb0161b729b7e9f98a918368494d852b 100644 (file)
--- a/sound/soc/codecs/wsa883x.c
+++ b/sound/soc/codecs/wsa883x.c
@@ -448,6 +448,7 @@ struct wsa883x_priv {
        int active_ports;
        int dev_mode;
        int comp_offset;
+       bool hw_init;
 };
 
 enum {
@@ -1007,6 +1008,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;
@@ -1050,6 +1054,8 @@ static int wsa883x_init(struct wsa883x_priv *wsa883x)
                                   wsa883x->comp_offset);
        }
 
+       wsa883x->hw_init = true;
+
        return 0;
 }
 
@@ -1058,6 +1064,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);