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 D73472E6CCD; Wed, 28 Jan 2026 15:39:46 +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=1769614786; cv=none; b=BUksb7QQWATheBRGdxHEAZZFAFp8/2b1OQxl6IEdic21ABoKAWlpeluNDn1LLCYwP6dBvQ4qlHqkSmWrmcmMSMV+tyrBpiQQ6VvM6oQNt9Mw9+8TFWiWqHNMGpTkn+4IQ5VwyWMZPhfbbyTqf/ie09IJKyci++EZbe/zdbd2kFY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769614786; c=relaxed/simple; bh=Sh/aAT6rKYspLHFtbLwurIRjtci4vRUuHkpfbg9o7Qs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jDZjAHpQfWhs0zK0qkPRZNojMykpEDAjTTytmiNXpwQxQUAkGV0/FFCocmZ4GK58LVLo5j8hX1Qd4vgb4xeO9wDSBGOw7LpF32Ha4P7b2v7Xrr8fhlqK3pR1J6guSYO7xECWhfwNNbBx4RQ/Xr3dSp24ASYxqGdYdoFald2eZXE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=SmeP3ET3; 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="SmeP3ET3" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 41B9DC4CEF1; Wed, 28 Jan 2026 15:39:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1769614786; bh=Sh/aAT6rKYspLHFtbLwurIRjtci4vRUuHkpfbg9o7Qs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SmeP3ET3MnVqsNcE5BtmrtvadB0jaYrS46k0RGWk0e2GGkY92uGlAM9srrVscmOna ZnAGMwZXSGn/VODwb0Xz8AFjBABKqqsFjPONmkbF6DrCeNta87X6Kp96/YckbzzXV7 rL0fZbI1DQNqBtiG+r8R2FbDjpfVNjPOBj0bbXik= 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.6 240/254] ASoC: codecs: wsa881x: fix unnecessary initialisation Date: Wed, 28 Jan 2026 16:23:36 +0100 Message-ID: <20260128145353.430249492@linuxfoundation.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260128145344.698118637@linuxfoundation.org> References: <20260128145344.698118637@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.6-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 @@ -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_ 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_ 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 { 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);