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 2B26637B40E for ; Fri, 11 Sep 2026 01:43:54 +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=1789091036; cv=none; b=TEXWI6mmnGgdrfW+fTkP7tueibcsYwChRc8Kmdv3kH1HjuGJLORd55DqxUFdRcwav1QiKg6kxDUYXokK2BaE821rW40G1kXvFfNgtAkTcpawkBevMfbdRaE7k0XxQvlhryKLZMOU3EDjI4z782B991Xq3MlgkeCH5OOju5zdJBk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789091036; c=relaxed/simple; bh=eKk1hl5X0ob8Wi4wnNyV9Q7bD79cOHpvzM1mj0jkeSE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Cf4osFGO58N+T6Zx+Qfk26mCNQsuSQN8wbdWGXSZtYx/RZURFgajaDliqngVYaQF98s42uXdp/mRWzJ11mF5qpt+NluIQcNC72qMxINz/AWrNRlXm7gtN8yIWmMzRYQ5If9/Tz4L2Ue+kE/NURi3bOgO/ggx7VNdohZ1Gcu5T98= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=QFt1o7AV; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="QFt1o7AV" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 441701F00893; Fri, 11 Sep 2026 01:43:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1789091034; bh=p8Rsz29K8qG5Nb+pacZC/OQdpxoa+FWe5pJ1zDqE8bs=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=QFt1o7AVjkHNl5CenT+tKgNKHtr5RPuMhYACQd6ukzN7tWuDIbdZNc5MeliFQiadP Uy4aLaaFdve4zkOTBom8cAN6mpewXKoY4GtnS7I2NFt6/974XH2S76vijttzndMH5o 1wPRHC+q29GLwG/m3mwPiPnBwgf8Gp0HohqJVujsC7e7u0THxTiDppN79nvp/L6let EDf1ulC4ZW6PBYYPLL/IvHS30EFKSBqY2LL/wyoFD6HrnE7ICE4ZLm89bzyPuivyX4 ixJD1zRA72tSOvOdZ1F/pHSbuk8LSBiHLaNVds+xdgIG1hgTa11ODSzS2hoNTK26vM 9xfsS1gBX94kA== From: Sasha Levin To: stable@vger.kernel.org Cc: Imran Shaik , Konrad Dybcio , Bjorn Andersson , Sasha Levin Subject: [PATCH 6.12.y] clk: qcom: Fix test_ctl_hi field for DEFAULT_EVO PLLs Date: Thu, 10 Sep 2026 21:43:52 -0400 Message-ID: <20260911014352.4149449-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026090946-backstab-laundry-5508@gregkh> References: <2026090946-backstab-laundry-5508@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Imran Shaik [ Upstream commit 830ead322c39c99bf972425b3c35323ec56c29de ] CLK_ALPHA_PLL_TYPE_DEFAULT_EVO type PLLs do not have the PLL_TEST_CTL_U1 register, so clk_alpha_pll_configure() does not program test_ctl_hi1_val for this PLL type. The GCC PLL configurations for QCM2290, Shikra and SM6115 wrongly use test_ctl_hi1_val instead of test_ctl_hi_val, deviating from the hardware recommended settings. Fix them to use test_ctl_hi_val. Fixes: 496d1a13d405 ("clk: qcom: Add Global Clock Controller driver for QCM2290") Fixes: 01cf3e27824d ("clk: qcom: Add Global clock controller support on Qualcomm Shikra SoC") Fixes: e88c533d8a2a ("clk: qcom: gcc-sm6115: Add missing PLL config properties") Cc: stable@vger.kernel.org Signed-off-by: Imran Shaik Reviewed-by: Konrad Dybcio Link: https://lore.kernel.org/r/20260729-pll-test-ctrl-fixup-v1-1-246d79589380@oss.qualcomm.com Signed-off-by: Bjorn Andersson [ Omitted gcc-shikra.c changes because the driver is absent from the target branch. ] Signed-off-by: Sasha Levin --- drivers/clk/qcom/gcc-qcm2290.c | 6 +++--- drivers/clk/qcom/gcc-sm6115.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/clk/qcom/gcc-qcm2290.c b/drivers/clk/qcom/gcc-qcm2290.c index 9a6703365e619..4d9dbe53cbffd 100644 --- a/drivers/clk/qcom/gcc-qcm2290.c +++ b/drivers/clk/qcom/gcc-qcm2290.c @@ -116,7 +116,7 @@ static const struct alpha_pll_config gpll10_config = { .vco_mask = GENMASK(21, 20), .main_output_mask = BIT(0), .config_ctl_val = 0x4001055B, - .test_ctl_hi1_val = 0x1, + .test_ctl_hi_val = 0x1, }; static struct clk_alpha_pll gpll10 = { @@ -148,7 +148,7 @@ static const struct alpha_pll_config gpll11_config = { .vco_mask = GENMASK(21, 20), .main_output_mask = BIT(0), .config_ctl_val = 0x4001055B, - .test_ctl_hi1_val = 0x1, + .test_ctl_hi_val = 0x1, }; static struct clk_alpha_pll gpll11 = { @@ -309,7 +309,7 @@ static const struct alpha_pll_config gpll8_config = { .post_div_val = 0x1 << 8, .post_div_mask = GENMASK(11, 8), .config_ctl_val = 0x4001055B, - .test_ctl_hi1_val = 0x1, + .test_ctl_hi_val = 0x1, }; static struct clk_alpha_pll gpll8 = { diff --git a/drivers/clk/qcom/gcc-sm6115.c b/drivers/clk/qcom/gcc-sm6115.c index 4c3804701e243..4bd2ebc158946 100644 --- a/drivers/clk/qcom/gcc-sm6115.c +++ b/drivers/clk/qcom/gcc-sm6115.c @@ -120,7 +120,7 @@ static const struct alpha_pll_config gpll10_config = { .vco_mask = GENMASK(21, 20), .main_output_mask = BIT(0), .config_ctl_val = 0x4001055b, - .test_ctl_hi1_val = 0x1, + .test_ctl_hi_val = 0x1, .test_ctl_hi_mask = 0x1, }; @@ -173,7 +173,7 @@ static const struct alpha_pll_config gpll11_config = { .vco_val = 0x2 << 20, .vco_mask = GENMASK(21, 20), .config_ctl_val = 0x4001055b, - .test_ctl_hi1_val = 0x1, + .test_ctl_hi_val = 0x1, .test_ctl_hi_mask = 0x1, }; @@ -367,7 +367,7 @@ static const struct alpha_pll_config gpll8_config = { .post_div_val = 0x1 << 8, .post_div_mask = GENMASK(11, 8), .config_ctl_val = 0x4001055b, - .test_ctl_hi1_val = 0x1, + .test_ctl_hi_val = 0x1, .test_ctl_hi_mask = 0x1, }; -- 2.53.0