Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3362C30E85E for ; Wed, 21 Jan 2026 01:39:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768959550; cv=none; b=krsFZ2Jg7y4K3WdqjZ1pZD2whYaKq3KxiZq9xLT9sCHa3Ug3v+romYvjHcllfNbDuSYjghq8w7iQt8gYRBv/cE8kzsfMSDh04tGNE3FjqdcPG9T6s4WcbvhU6YbiyJdIuEHSII2VkYh1hr6kEBKUDEE/0VaoL2E8sgGsiWxxEWg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768959550; c=relaxed/simple; bh=eL0HdPo74zF2DE9UauexZWwSlS7UvQftikRm000OEQs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dpS3fu93fJ9zm7vpbak9Ei8/NlltSK7Uvnt9zRVgunpMQxU0xZL5gkMIoy/qKF8wyAM5gbPt9RE6UjRv7GX56QSOhLqziB+U2xQLl96k6G31Ph2BVzFZ+O/I3rTXtIyKekfkV33ZEmcxqFI+2sSzpyOQYAf87/JqIh8nP+aM8eY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ROSwEPya; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="ROSwEPya" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D340AC19425; Wed, 21 Jan 2026 01:39:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1768959549; bh=eL0HdPo74zF2DE9UauexZWwSlS7UvQftikRm000OEQs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ROSwEPyaKKu6tOPOAEg34QHhEJO3kxep73Gs9SjvtrDmpm/Is4x3MtOENm60kfItW cTJB+PynyQFqWwm7hMBzX0srlSVQKVJQsoccWtH6VEXvKV+SVq6X1zmBy9CbeG8EP/ wMKizHZ34ovWYBgkJkAfs1Ez28+eVl2956TQ91pMrEazKSKnseS698v9Ihhl+xUcUt ChkD/Fwr02ekRcOt4hCulM86BTYmZ5QI8WRrUvKNKWuanKZF03VnKd1x7wN7YNy4BD nJu8JKpYhDYS6IGukHsWcx8hqxG9dexe8jpgbaADPGMM5uqZSDH8HEPWikmuXdMQey jV9eRyWdPOJKg== From: Sasha Levin To: stable@vger.kernel.org Cc: Johan Hovold , Srinivas Kandagatla , Krzysztof Kozlowski , Srinivas Kandagatla , Mark Brown , Sasha Levin Subject: [PATCH 6.6.y 2/2] ASoC: codecs: wsa881x: fix unnecessary initialisation Date: Tue, 20 Jan 2026 20:39:06 -0500 Message-ID: <20260121013906.1104336-2-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260121013906.1104336-1-sashal@kernel.org> References: <2026012028-unclamped-unfrozen-60bd@gregkh> <20260121013906.1104336-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Johan Hovold [ Upstream commit 29d71b8a5a40708b3eed9ba4953bfc2312c9c776 ] 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: a0aab9e1404a ("ASoC: codecs: add wsa881x amplifier support") Cc: stable@vger.kernel.org # 5.6 Cc: Srinivas Kandagatla Signed-off-by: Johan Hovold Reviewed-by: Krzysztof Kozlowski Reviewed-by: Srinivas Kandagatla Link: https://patch.msgid.link/20260102111413.9605-3-johan@kernel.org Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/codecs/wsa881x.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sound/soc/codecs/wsa881x.c b/sound/soc/codecs/wsa881x.c index 2b0c26664762f..c1f1414aa5121 100644 --- a/sound/soc/codecs/wsa881x.c +++ b/sound/soc/codecs/wsa881x.c @@ -681,6 +681,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]; }; @@ -690,6 +691,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)); @@ -727,6 +731,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) @@ -1071,6 +1077,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); -- 2.51.0