From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 EDC6035C6A7; Tue, 21 Jul 2026 21:25:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784669149; cv=none; b=sh4W/HYrSCECbLzNk4gDvm9UJ4iCIgUAguw41GYo6RQg2MkXVAaSd/lmDC4rKa/PYUUBMAhrp5xH+2Z9aGXACDR32lP1aR3nm3NPvsQSHNMwXi5cTeip6qK9T+l5mgfjGuL5oKWZF5vZUM5YbnlFNudJwUCiNkv9DdXvIqgTlJs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784669149; c=relaxed/simple; bh=wGSvpSkCVNgQWkF49O/gM7k+jfH90JbxOdl/MTCO56s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=SNlA/6Ym3ERvG7YK2mx+CsACgfewK+gChDoNPa1n8kzgs3GI1yD1oKoY2ZOrZZsmhXqSJipceewRbFjN03tRu+if8RZWvAHivAuO3Kl9qzeG6jy5V3hEOOz9a4YvS1TmBM5J0Cjh73h6OS2Om5MW5g4oPliTNnz6KOXGFdE3Y6M= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=L7ThzuFr; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="L7ThzuFr" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5948E1F00A3A; Tue, 21 Jul 2026 21:25:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1784669147; bh=Rut4fuKmdPRHtq2gAUcvKVKM8oLXZ59Inhpm4qnecno=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=L7ThzuFrUN3Eh4Q0yF9SYot6XqjiL+pE3jsNsV6OJD62JYXenqz32wVvyVGpZtxiB QE8GhEvT9hXsNELbiqXIgvQkeQZKS3v4aw3B3+7lg3qwESxXR5k43Jti+19m330Rob i33J6kk4oYMIgQdvFeoPgvigOMH3kIrzwAFedrZc= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Guangshuo Li , Mark Brown , Sasha Levin Subject: [PATCH 6.1 0445/1067] ASoC: adau1372: Clear PLL_EN on failed PLL lock without reset GPIO Date: Tue, 21 Jul 2026 17:17:26 +0200 Message-ID: <20260721152434.571771115@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260721152424.521567757@linuxfoundation.org> References: <20260721152424.521567757@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev 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: Guangshuo Li [ Upstream commit 69b4141b428bcf2cf7a863950c0d6e5c5ae89ac1 ] The PLL lock failure path in adau1372_set_power() unwinds by putting the regmap back in cache-only mode, asserting the optional power-down GPIO and disabling mclk. adau1372_enable_pll() enables CLK_CTRL.PLL_EN before polling the PLL lock bit. If the lock fails on a board without a power-down GPIO, the error path disables mclk and returns an error, but leaves PLL_EN set in the hardware register. The normal power-off path already handles the no-GPIO case by explicitly clearing PLL_EN. Mirror that cleanup in the PLL lock failure path and clear PLL_EN while the regmap is still live, before switching it back to cache-only mode. Fixes: bfe6a264effc ("ASoC: adau1372: Fix clock leak on PLL lock failure") Signed-off-by: Guangshuo Li Link: https://patch.msgid.link/20260604125520.1428905-1-lgs201920130244@gmail.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/codecs/adau1372.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sound/soc/codecs/adau1372.c b/sound/soc/codecs/adau1372.c index 1a4ab7c993d28c..3e3b8955036d94 100644 --- a/sound/soc/codecs/adau1372.c +++ b/sound/soc/codecs/adau1372.c @@ -812,6 +812,11 @@ static int adau1372_set_power(struct adau1372 *adau1372, bool enable) if (adau1372->use_pll) { ret = adau1372_enable_pll(adau1372); if (ret) { + if (!adau1372->pd_gpio) + regmap_update_bits(adau1372->regmap, + ADAU1372_REG_CLK_CTRL, + ADAU1372_CLK_CTRL_PLL_EN, + 0); regcache_cache_only(adau1372->regmap, true); if (adau1372->pd_gpio) gpiod_set_value(adau1372->pd_gpio, 1); -- 2.53.0