From: Sascha Hauer <[email protected]>
The rk3588 CPLL should be configured to 1.5GHz and 09c87c85e0 ("ARM:
dts: rockchip: Set CPLL frequency for RK3588") does this. It does it
however after the assigned-clocks/assigned-clock-rates properties of the
"rockchip,rk3588-cru" node have been evaluated which contain a setting
of CLK_150M_SRC which is a child clock of the CPLL. Configuring the
CPLL after CLK_150M_SRC alters the setting of the just configured 150M
clock again.
We must make sure to configure the CPLL before its child clocks. For
this we could overwrite the assigned-* properties in the
"rockchip,rk3588-cru" node, but with that we would miss future updates
to this property, so configure the CPLL in the driver code instead right
before we call into of_clk_add_provider().
Fixes: 09c87c85e0 ("ARM: dts: rockchip: Set CPLL frequency for RK3588")
Tested-by: Michael Tretter <[email protected]>
Link: https://lore.barebox.org/[email protected]
Signed-off-by: Sascha Hauer <[email protected]>
(cherry picked from commit 45b4b47cc650b0552d4920d0a353a860f6d2468c)
Signed-off-by: Ahmad Fatoum <[email protected]>
---
arch/arm/dts/rk3588.dtsi | 3 ---
drivers/clk/rockchip/clk-rk3588.c | 7 +++++++
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/arch/arm/dts/rk3588.dtsi b/arch/arm/dts/rk3588.dtsi
index 42d692a9bdd1..416700cf0ecd 100644
--- a/arch/arm/dts/rk3588.dtsi
+++ b/arch/arm/dts/rk3588.dtsi
@@ -1,9 +1,6 @@
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
/ {
- assigned-clocks = <&cru PLL_CPLL>;
- assigned-clock-rates = <1500000000>;
-
dmc: memory-controller {
compatible = "rockchip,rk3588-dmc";
rockchip,pmu = <&pmu1grf>;
diff --git a/drivers/clk/rockchip/clk-rk3588.c
b/drivers/clk/rockchip/clk-rk3588.c
index 5aecfb3b1b71..eb6b4fde1451 100644
--- a/drivers/clk/rockchip/clk-rk3588.c
+++ b/drivers/clk/rockchip/clk-rk3588.c
@@ -2500,6 +2500,13 @@ static void __init rk3588_clk_init(struct device_node
*np)
rockchip_register_restart_notifier(ctx, RK3588_GLB_SRST_FST);
+ /*
+ * CPLL must run at 1.5GHz. Do this here instead via assigned-clocks
+ * in the device tree so that we do not have to overwrite the properties
+ * in the upstream device tree.
+ */
+ clk_set_rate(ctx->clk_data.clks[PLL_CPLL], 1500000000);
+
rockchip_clk_of_add_provider(np, ctx);
}
--
2.47.3
