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 2341034A77F for ; Wed, 21 Jan 2026 02:47:45 +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=1768963666; cv=none; b=nR9Kbu9seEkHuUbisUq3k47K3UabMbG0o8K/sckpaoh4qFDgaKquXjuxb6ZRzjBQEZ4hlvEHJT1wLRTvoPeTsl31gpQOAgVMtDECo00pS2JYkaWjYDTq5nXS9XxX4LF0mqLtNENTdEiKsK9UCeWTKhJFo1F/uIVxmwPWopzW+Ws= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768963666; c=relaxed/simple; bh=Ad7gaW4tc2NGx+4DqIgrhDweXMgxNQMz8OL0XqtdSKQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=TlPldJx0Ae1fi9fnQIT2Sn8SBAMzixwvgdxG371KEhMJXJjRiAxziCq4Sv/lJzfVccQF+LYZyINBgq0sduxOoz2fmoVmINUEaIb1mzj2Xr2agSBuG1nDAGkcjs2+lIpqwBZ6dicdiG1RvAs42RgRMkUChO3oxiUeqgX0xAJIcws= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=InfvpxKf; 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="InfvpxKf" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E9E85C19423; Wed, 21 Jan 2026 02:47:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1768963665; bh=Ad7gaW4tc2NGx+4DqIgrhDweXMgxNQMz8OL0XqtdSKQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=InfvpxKfbDxYpOXzdHJDoCQxB3YsSOUXQtVvg8ZWFR8yjybrbHBLhMFpJ6ZRISG1D a2eIzZQJ8Xk97cImwqIKKk4DYRbRWlXRk/lMKa2mun3ieS5BFOtIDPA/ZjYTOtMRlU FEwlSiFV4MGCRQmEnhLWUighytZ7APHRZRDcq7WN5e9AvntQt/ce8BYCb7Si3v46X4 IKXXf74/7/kAdP1SuqeLKbSvo1krW8IlAWy0IUFxAtzCVS9M+K9onDoEEzxX6pl1v+ azpoAHnQ5kSeNQuvdwMdxadOFTTU0fDLXcOwWuZnnajZncaESPVZDrh1DSrdDeIqRP +fT+qyhTY24HQ== From: Sasha Levin To: stable@vger.kernel.org Cc: Johan Hovold , Srinivas Kandagatla , Krzysztof Kozlowski , Srinivas Kandagatla , Mark Brown , Sasha Levin Subject: [PATCH 5.15.y 4/4] ASoC: codecs: wsa881x: fix unnecessary initialisation Date: Tue, 20 Jan 2026 21:47:40 -0500 Message-ID: <20260121024740.1145743-4-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260121024740.1145743-1-sashal@kernel.org> References: <2026012029-possibly-cornhusk-03c3@gregkh> <20260121024740.1145743-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 80625efc2fc7e..22c382f0c68bf 100644 --- a/sound/soc/codecs/wsa881x.c +++ b/sound/soc/codecs/wsa881x.c @@ -682,6 +682,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]; }; @@ -691,6 +692,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)); @@ -728,6 +732,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) @@ -1064,6 +1070,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