Skip to content

Commit 29d71b8

Browse files
jhovoldbroonie
authored andcommitted
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: a0aab9e ("ASoC: codecs: add wsa881x amplifier support") Cc: stable@vger.kernel.org # 5.6 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-3-johan@kernel.org Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 49aadf8 commit 29d71b8

1 file changed

Lines changed: 9 additions & 0 deletions

File tree

sound/soc/codecs/wsa881x.c

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -678,6 +678,7 @@ struct wsa881x_priv {
678678
*/
679679
unsigned int sd_n_val;
680680
int active_ports;
681+
bool hw_init;
681682
bool port_prepared[WSA881X_MAX_SWR_PORTS];
682683
bool port_enable[WSA881X_MAX_SWR_PORTS];
683684
};
@@ -687,6 +688,9 @@ static void wsa881x_init(struct wsa881x_priv *wsa881x)
687688
struct regmap *rm = wsa881x->regmap;
688689
unsigned int val = 0;
689690

691+
if (wsa881x->hw_init)
692+
return;
693+
690694
regmap_register_patch(wsa881x->regmap, wsa881x_rev_2_0,
691695
ARRAY_SIZE(wsa881x_rev_2_0));
692696

@@ -724,6 +728,8 @@ static void wsa881x_init(struct wsa881x_priv *wsa881x)
724728
regmap_update_bits(rm, WSA881X_OTP_REG_28, 0x3F, 0x3A);
725729
regmap_update_bits(rm, WSA881X_BONGO_RESRV_REG1, 0xFF, 0xB2);
726730
regmap_update_bits(rm, WSA881X_BONGO_RESRV_REG2, 0xFF, 0x05);
731+
732+
wsa881x->hw_init = true;
727733
}
728734

729735
static int wsa881x_component_probe(struct snd_soc_component *comp)
@@ -1067,6 +1073,9 @@ static int wsa881x_update_status(struct sdw_slave *slave,
10671073
{
10681074
struct wsa881x_priv *wsa881x = dev_get_drvdata(&slave->dev);
10691075

1076+
if (status == SDW_SLAVE_UNATTACHED)
1077+
wsa881x->hw_init = false;
1078+
10701079
if (status == SDW_SLAVE_ATTACHED && slave->dev_num > 0)
10711080
wsa881x_init(wsa881x);
10721081

0 commit comments

Comments
 (0)