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 F0FEF470116; Tue, 21 Jul 2026 17:58:59 +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=1784656741; cv=none; b=cNI79imouy1wF6x3jPcKgMUUUyjOIEgqm+6jmLORHBrkrz8BbNs+EELjKUHjQgtAWWZSEMCZ9uKH/drnriGjDenMswkqDtyzXXymyhFGf6yaozCWELz70iONXzoOtqVs+1x+aUSNrGACt6t/lCL4ifQ8asc96EIzZzszKgwtjNo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784656741; c=relaxed/simple; bh=sjbwpQiI3PY7RYbSOZcopoU9vzGP4iqT55qsiUN2Tdk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tIsBDNlj/9YykCH8j7n8UESYbjDBLb+E0oDdEfGq6l6i5wQoj2cIjL4OllPObs7nTJVagH9yPg9m73C/+6apnv41wGEWzfxQ/p9rB/WGiMUG+d+ZE+8GttKRmdJh96HG0fpfLM5wNhYcQpnumVp6uz3W/tZjgCi8F+WmnZIRKQQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=rVSGxbN8; 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="rVSGxbN8" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 634541F000E9; Tue, 21 Jul 2026 17:58:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1784656739; bh=VN8IWZdJQnVfy0Vh1vioy8BokWETXMu3GT2TTcjcWEY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=rVSGxbN8SYL4ZHJJ0oPqf/VGr7leD9c4FBz7QxUQQ3EWyU2ORxYfGkCChf6v0MRES By6JBp46QbL0ejfpn2Gm29JsmBKVi6CxCIVpxZCOZIcIlUkDd1OrVoQubj4q8Ptf6u an1Sacemg0SCGWLwC00jPJo/EH6fTw9bCEW/0/GY= 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.18 0500/1611] ASoC: adau1372: Clear PLL_EN on failed PLL lock without reset GPIO Date: Tue, 21 Jul 2026 17:10:16 +0200 Message-ID: <20260721152526.591644007@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260721152514.750365251@linuxfoundation.org> References: <20260721152514.750365251@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.18-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 d7363f9d53bb31..879afeb81c422d 100644 --- a/sound/soc/codecs/adau1372.c +++ b/sound/soc/codecs/adau1372.c @@ -813,6 +813,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