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 ECAEA1DE8A5; Tue, 3 Dec 2024 15:55:57 +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=1733241358; cv=none; b=d2u7oYViTqUtza9lWLLYQoJyHkuBvT0I63HRfjBFU5bETxJn4k2fXYv/ut2Rh7RIyxWBU+b3olAsr1RPJnp8igUQq9IHNova6NpaXqo/AijHSbVrjRLrYrPrmcz+hA59QOQ0YQ7wPGB551eG7zwpBmmCjn0h1iF7eHNG0uJbLYw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733241358; c=relaxed/simple; bh=8mvqQOo8mtK/nk7Vh2nyEAkOFak9m3qvEN5H6nVhm6c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=R8uL89zbfg+BLiTuIIBA7marVDyRcA/QZpf189DqAaTDJyL9e9ylHnUWW51Q6XSUZFoAlN+lfz966M5vil4OKqdN4rBPlNV5uer/Khipf4YXJGVaLsymmFXmZByyUjljXgfmIUo5IYmTtz5tCIsV+DUpsSbomP9lIEut/nhl6gM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=AgIV24f0; 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="AgIV24f0" Received: by smtp.kernel.org (Postfix) with ESMTPSA id ECD98C4CECF; Tue, 3 Dec 2024 15:55:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1733241357; bh=8mvqQOo8mtK/nk7Vh2nyEAkOFak9m3qvEN5H6nVhm6c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AgIV24f07X1ekUl9mJoS6gxsxkf+oiBL/WziKJepmgApVw+VE1GBQevQTh522H+BH fytM/UdG5BHiIFf5ABOpGUt9+B3dgv9oxvtim69UXeGDbEKiWluT8qJEysBh8UgEzt Ank2+sF5AlXe7AdtX2lqNBbO7+3TliBNbghsM2H8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Andre Przywara , Chen-Yu Tsai , Sasha Levin Subject: [PATCH 6.12 397/826] clk: sunxi-ng: d1: Fix PLL_AUDIO0 preset Date: Tue, 3 Dec 2024 15:42:04 +0100 Message-ID: <20241203144759.247967526@linuxfoundation.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241203144743.428732212@linuxfoundation.org> References: <20241203144743.428732212@linuxfoundation.org> User-Agent: quilt/0.67 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.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Andre Przywara [ Upstream commit e0f253a52ccee3cf3eb987e99756e20c68a1aac9 ] To work around a limitation in our clock modelling, we try to force two bits in the AUDIO0 PLL to 0, in the CCU probe routine. However the ~ operator only applies to the first expression, and does not cover the second bit, so we end up clearing only bit 1. Group the bit-ORing with parentheses, to make it both clearer to read and actually correct. Fixes: 35b97bb94111 ("clk: sunxi-ng: Add support for the D1 SoC clocks") Signed-off-by: Andre Przywara Link: https://patch.msgid.link/20241001105016.1068558-1-andre.przywara@arm.com Signed-off-by: Chen-Yu Tsai Signed-off-by: Sasha Levin --- drivers/clk/sunxi-ng/ccu-sun20i-d1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/clk/sunxi-ng/ccu-sun20i-d1.c b/drivers/clk/sunxi-ng/ccu-sun20i-d1.c index 9b5cfac2ee70c..3f095515f54f9 100644 --- a/drivers/clk/sunxi-ng/ccu-sun20i-d1.c +++ b/drivers/clk/sunxi-ng/ccu-sun20i-d1.c @@ -1371,7 +1371,7 @@ static int sun20i_d1_ccu_probe(struct platform_device *pdev) /* Enforce m1 = 0, m0 = 0 for PLL_AUDIO0 */ val = readl(reg + SUN20I_D1_PLL_AUDIO0_REG); - val &= ~BIT(1) | BIT(0); + val &= ~(BIT(1) | BIT(0)); writel(val, reg + SUN20I_D1_PLL_AUDIO0_REG); /* Force fanout-27M factor N to 0. */ -- 2.43.0