From mboxrd@z Thu Jan 1 00:00:00 1970 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 ABF203D994; Wed, 4 Feb 2026 15:16:57 +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=1770218217; cv=none; b=eL3jQYvD7TW4XcZaaFdGN9MXExVOxVm14U1pvfoxV4LMyAmZENdFGn6f2j+kgeJZxkw42KV3mOuHwqlDx4xsE3hVWIfdZqUkioRWbBATZfgK0VN2Dj+1mIKdIEU2RVmbKHXi8K9r8K93+N7UF4h+IIkQ5SpFMmPwnlurDZCyyoA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770218217; c=relaxed/simple; bh=8qTrFQQDnm75LH/wCmIW55cCmTbN9jLmz4aYo6tcTsU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=r2ghDRKC2ozBO4i+/ClCNlYZ11obD+jy19lVp9+RDZ9EPYh23bdnkgAXY0FCnGVKvDpexrltO3Gdwh6yuSoRhrVpPM/z8U/EpRAbJt3Stq1m3YzUNqIlmhP9pbtEN7TJ/4kQMJ/2EVlCqvhcy8WeYOcYJFwVR9V+8IJYrK1QMII= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=wJ+QZYDq; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="wJ+QZYDq" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1A3EEC4CEF7; Wed, 4 Feb 2026 15:16:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1770218217; bh=8qTrFQQDnm75LH/wCmIW55cCmTbN9jLmz4aYo6tcTsU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wJ+QZYDqXVAkP50SuFQCMq0BR7gVzDol7ygr4ol2QdZE6Jdh52XhXcvRpEOPDi188 1V15Be8vt6q9QCQodsspMayAU+qf0BKU9gAL2dFK6pMiLV1Y3631n+6mtg5XAtSoBd hzyWbxLVn2nDj0w99aWwFha0vaPVg+MrVkk1xrjQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Srinivas Kandagatla , Johan Hovold , Krzysztof Kozlowski , Srinivas Kandagatla , Mark Brown , Sasha Levin Subject: [PATCH 6.1 247/280] ASoC: codecs: wsa881x: fix unnecessary initialisation Date: Wed, 4 Feb 2026 15:40:21 +0100 Message-ID: <20260204143918.527380933@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260204143909.614719725@linuxfoundation.org> References: <20260204143909.614719725@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ 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 Signed-off-by: Greg Kroah-Hartman --- sound/soc/codecs/wsa881x.c | 9 +++++++++ 1 file changed, 9 insertions(+) --- a/sound/soc/codecs/wsa881x.c +++ b/sound/soc/codecs/wsa881x.c @@ -684,6 +684,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]; }; @@ -693,6 +694,9 @@ static void wsa881x_init(struct 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)); @@ -730,6 +734,8 @@ static void wsa881x_init(struct 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) @@ -1074,6 +1080,9 @@ static int wsa881x_update_status(struct { 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);