Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795056747; b=AA/SMfxfH/7aBGiEysrF2UPFzNfk9itiSs4uAHjO2OCvl2UZ0MuKZwGNq8YAcXRdKES0 HPSHhZdXg4aI6+5sisb+3efdl6cqz01xucGXcmXAUYoapDoJUaQvwCF+F9iWm6HvHNJwM pHXqGamA1QIq2pQImWfJ+KhdzRVN3IKgPclC05WkXiaSMiRwmE8QRHsZ+fIKLdzQHhKG/ p2yY0GSOAKz7uo+UkfWlIpxvesaEIYz5XZdKK/8mlPAzaqtyC4y3oMrQMn6brosjLZYBI 6T9/gWM6AX/Dm858HD7d6kNiQ8TMNRhRQ5Cb38HPMeIxwNM0G2go/wqFTRtceeVNaPQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795056747; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=u1nMeWzo34vPpaXHqEih9xXasSKHpuA4lbgNnRKGDzA=; b=Vcniv+M6uD670EUIri//4MB3vA+qIdchrAdA0y5BlSIwqfgamD6bLQWes6qJDwdT2N/F ZIPE0JxMSGSrhas/dlI+Q4OxdJVPzwDj95M+FQHqrnGTjjJ8L3sCnzZPzlkdfW9hNSNIE DVKUO3jpmXVx2rcndiBJsciaPTYg6K0B6aYMAyjeN9NPG9h0kqF60kuDNnj9J/3VvQKk4 CKJ47RrnsQN8NmEztOoHA+CJ1mc7dBVQgixMRQYHawdtqV3XsSQ6vO7MTY1dL+15TWAX+ KH9BVNgaxsHMhzBcVEV504sTEs7+8T04DFKeHKN77CA7iYAEuh0+l8m+n0WyyGTt6aA== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=N6qffx7d; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EE119606A325; Thu, 19 Nov 2026 02:52:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=N6qffx7d Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4C8471F000C4; Thu, 19 Nov 2026 02:52:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795056746; bh=u1nMeWzo34vPpaXHqEih9xXasSKHpuA4lbgNnRKGDzA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=N6qffx7d5sSneh7oXFe7TRpg91FBMwhgbeoUl9UQc972HgctcHvbcfBKm2dDAbe3h My2N3TSeLuD5NHYrCGl9n4TrWvBohzKTYsUhQ8RQHG4yub4FSBqsoEnj9pKryREWm+ QjNqvZMh51M8BDANJ/CLYFHfNiuBgdfBuGxsn4Rk= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Marek Szyprowski , Mark Brown , Sasha Levin Subject: [PATCH 5.15 2098/2214] ASoC: wm8994: follow AIF clock source changes in MCLK gating Date: Wed, 18 Nov 2026 16:02:54 +0100 Message-ID: <20261118150134.600197736@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150009.797899913@linuxfoundation.org> References: <20261118150009.797899913@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Marek Szyprowski [ Upstream commit 8731e33a3b98ea1ccade059b3a1ce06b7dd66b17 ] The AIF clock source can be changed by configure_aif_clock() while the AIF clock is running, for example the Midas machine driver switches AIF1 between MCLK2 and FLL1 while AIF1CLK is kept enabled for jack detection. aif_mclk_set() only enables the MCLK selected at the time the AIF clock is turned on, so an MCLK selected later this way is never enabled, and the codec may run from a stopped clock. Track whether the AIF clock is running and, if so, enable the newly selected MCLK in configure_aif_clock() before switching to it, then release the previously enabled one. Fixes: 001b83d395ab ("ASoC: wm8994: Add support for MCLKn clock gating") Signed-off-by: Marek Szyprowski Link: https://patch.msgid.link/20261022101531.775891-1-m.szyprowski@samsung.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/codecs/wm8994.c | 27 +++++++++++++++++++++++++++ sound/soc/codecs/wm8994.h | 1 + 2 files changed, 28 insertions(+) diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c index ef62c26628e7c..0ffabd755f4d4 100644 --- a/sound/soc/codecs/wm8994.c +++ b/sound/soc/codecs/wm8994.c @@ -162,9 +162,12 @@ static void wm8958_micd_set_rate(struct snd_soc_component *component) static int configure_aif_clock(struct snd_soc_component *component, int aif) { struct wm8994_priv *wm8994 = snd_soc_component_get_drvdata(component); + struct clk *mclk = NULL; + bool switch_mclk; int rate; int reg1 = 0; int offset; + int ret; if (aif) offset = 4; @@ -173,11 +176,13 @@ static int configure_aif_clock(struct snd_soc_component *component, int aif) switch (wm8994->sysclk[aif]) { case WM8994_SYSCLK_MCLK1: + mclk = wm8994->mclk[WM8994_MCLK1].clk; rate = wm8994->mclk_rate[0]; break; case WM8994_SYSCLK_MCLK2: reg1 |= 0x8; + mclk = wm8994->mclk[WM8994_MCLK2].clk; rate = wm8994->mclk_rate[1]; break; @@ -195,6 +200,20 @@ static int configure_aif_clock(struct snd_soc_component *component, int aif) return -EINVAL; } + /* + * If the AIF clock is running, enable the new MCLK before switching + * to it and release the previous one afterwards. + */ + switch_mclk = wm8994->aif_clk_on[aif] && mclk != wm8994->aif_mclk[aif]; + if (switch_mclk) { + ret = clk_prepare_enable(mclk); + if (ret < 0) { + dev_err(component->dev, + "Failed to enable MCLK for AIF%d\n", aif + 1); + return ret; + } + } + if (rate >= 13500000) { rate /= 2; reg1 |= WM8994_AIF1CLK_DIV; @@ -209,6 +228,11 @@ static int configure_aif_clock(struct snd_soc_component *component, int aif) WM8994_AIF1CLK_SRC_MASK | WM8994_AIF1CLK_DIV, reg1); + if (switch_mclk) { + clk_disable_unprepare(wm8994->aif_mclk[aif]); + wm8994->aif_mclk[aif] = mclk; + } + return 0; } @@ -1070,6 +1094,7 @@ static int aif_mclk_set(struct snd_soc_component *component, int aif, bool enabl if (!enable) { clk_disable_unprepare(wm8994->aif_mclk[aif]); wm8994->aif_mclk[aif] = NULL; + wm8994->aif_clk_on[aif] = false; return 0; } @@ -1089,6 +1114,7 @@ static int aif_mclk_set(struct snd_soc_component *component, int aif, bool enabl clk_idx = WM8994_MCLK2; break; default: + wm8994->aif_clk_on[aif] = true; return 0; } @@ -1099,6 +1125,7 @@ static int aif_mclk_set(struct snd_soc_component *component, int aif, bool enabl return ret; } wm8994->aif_mclk[aif] = wm8994->mclk[clk_idx].clk; + wm8994->aif_clk_on[aif] = true; return 0; } diff --git a/sound/soc/codecs/wm8994.h b/sound/soc/codecs/wm8994.h index 28a54007302f9..0d3d5fc0ff034 100644 --- a/sound/soc/codecs/wm8994.h +++ b/sound/soc/codecs/wm8994.h @@ -82,6 +82,7 @@ struct wm8994_priv { struct wm8994 *wm8994; struct clk_bulk_data mclk[WM8994_NUM_MCLK]; struct clk *aif_mclk[2]; + bool aif_clk_on[2]; int sysclk[2]; int sysclk_rate[2]; int mclk_rate[2]; -- 2.53.0