[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20250930-a4_a5_add_clock_driver-v1-5-a9acf7951589@amlogic.com>
Date: Tue, 30 Sep 2025 17:37:18 +0800
From: Chuan Liu via B4 Relay <devnull+chuan.liu.amlogic.com@...nel.org>
To: Michael Turquette <mturquette@...libre.com>,
Stephen Boyd <sboyd@...nel.org>, Rob Herring <robh@...nel.org>,
Krzysztof Kozlowski <krzk+dt@...nel.org>,
Conor Dooley <conor+dt@...nel.org>,
Neil Armstrong <neil.armstrong@...aro.org>,
Jerome Brunet <jbrunet@...libre.com>, Kevin Hilman <khilman@...libre.com>,
Martin Blumenstingl <martin.blumenstingl@...glemail.com>
Cc: linux-kernel@...r.kernel.org, linux-clk@...r.kernel.org,
devicetree@...r.kernel.org, linux-amlogic@...ts.infradead.org,
linux-arm-kernel@...ts.infradead.org,
Xianwei Zhao <xianwei.zhao@...ogic.com>, Chuan Liu <chuan.liu@...ogic.com>
Subject: [PATCH 05/19] clk: amlogic: Correct l_detect bit control
From: Chuan Liu <chuan.liu@...ogic.com>
l_detect controls the enable/disable of the PLL lock-detect module.
For A1, the l_detect signal is active-low:
0 -> Enable lock-detect module;
1 -> Disable lock-detect module.
Signed-off-by: Chuan Liu <chuan.liu@...ogic.com>
---
drivers/clk/meson/a1-pll.c | 1 +
drivers/clk/meson/clk-pll.c | 16 ++++++++++++----
drivers/clk/meson/clk-pll.h | 2 ++
3 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/drivers/clk/meson/a1-pll.c b/drivers/clk/meson/a1-pll.c
index 1f82e9c7c14e..bfe559c71402 100644
--- a/drivers/clk/meson/a1-pll.c
+++ b/drivers/clk/meson/a1-pll.c
@@ -137,6 +137,7 @@ static struct clk_regmap a1_hifi_pll = {
.range = &a1_hifi_pll_range,
.init_regs = a1_hifi_pll_init_regs,
.init_count = ARRAY_SIZE(a1_hifi_pll_init_regs),
+ .flags = CLK_MESON_PLL_L_DETECT_N
},
.hw.init = &(struct clk_init_data){
.name = "hifi_pll",
diff --git a/drivers/clk/meson/clk-pll.c b/drivers/clk/meson/clk-pll.c
index 8bddd44d4738..c1e4c5710015 100644
--- a/drivers/clk/meson/clk-pll.c
+++ b/drivers/clk/meson/clk-pll.c
@@ -384,8 +384,12 @@ static int meson_clk_pll_enable(struct clk_hw *hw)
meson_parm_write(clk->map, &pll->rst, 1);
/* Disable the PLL lock-detect module */
- if (MESON_PARM_APPLICABLE(&pll->l_detect))
- meson_parm_write(clk->map, &pll->l_detect, 1);
+ if (MESON_PARM_APPLICABLE(&pll->l_detect)) {
+ if (pll->flags & CLK_MESON_PLL_L_DETECT_N)
+ meson_parm_write(clk->map, &pll->l_detect, 1);
+ else
+ meson_parm_write(clk->map, &pll->l_detect, 0);
+ }
/* Enable the pll */
meson_parm_write(clk->map, &pll->en, 1);
@@ -413,8 +417,12 @@ static int meson_clk_pll_enable(struct clk_hw *hw)
udelay(20);
/* Enable the lock-detect module */
- if (MESON_PARM_APPLICABLE(&pll->l_detect))
- meson_parm_write(clk->map, &pll->l_detect, 0);
+ if (MESON_PARM_APPLICABLE(&pll->l_detect)) {
+ if (pll->flags & CLK_MESON_PLL_L_DETECT_N)
+ meson_parm_write(clk->map, &pll->l_detect, 0);
+ else
+ meson_parm_write(clk->map, &pll->l_detect, 1);
+ }
if (meson_clk_pll_wait_lock(hw)) {
/* disable PLL when PLL lock failed. */
diff --git a/drivers/clk/meson/clk-pll.h b/drivers/clk/meson/clk-pll.h
index 949157fb7bf5..83295a24721f 100644
--- a/drivers/clk/meson/clk-pll.h
+++ b/drivers/clk/meson/clk-pll.h
@@ -29,6 +29,8 @@ struct pll_mult_range {
#define CLK_MESON_PLL_ROUND_CLOSEST BIT(0)
#define CLK_MESON_PLL_NOINIT_ENABLED BIT(1)
+/* l_detect signal is active-low */
+#define CLK_MESON_PLL_L_DETECT_N BIT(2)
struct meson_clk_pll_data {
struct parm en;
--
2.42.0
Powered by blists - more mailing lists