arm64: dts: rockchip: fix RK3576 SCMI clock IDs

Downstream Linux, and consequently both downstream and mainline TF-A,
all use a different set of clock IDs from mainline Linux. If we want to
fiddle with these clocks through SCMI, we'll need to use the right IDs.
If we don't do this we'll end up changing unrelated clocks all over the
place.

Change the clock IDs to the newly added SCMI clock IDs for the CPU and
GPU nodes, which are currently the only ones using SCMI clocks. This
fixes the terrible GPU performance, as we weren't reclocking it
properly.

Fixes: 57b1ce903966 ("arm64: dts: rockchip: Add rk3576 SoC base DT")
Reported-by: Jonas Karlman <jonas@kwiboo.se>
Closes: https://libera.irclog.whitequark.org/linux-rockchip/2025-03-09#1741542223-1741542875;
Signed-off-by: Nicolas Frattaroli <nicolas.frattaroli@collabora.com>
Link: https://lore.kernel.org/r/20250310-rk3576-scmi-clocks-v1-2-e165deb034e8@collabora.com
Signed-off-by: Heiko Stuebner <heiko@sntech.de>

diff --git a/arch/arm64/boot/dts/rockchip/rk3576.dtsi b/arch/arm64/boot/dts/rockchip/rk3576.dtsi
index edfa0326f2996d79e696f36befdb89c3524b98d4..b379e462294762bac9db0840d58334fbd6a9cf4d 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3576.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3576.dtsi
@@ -111,7 +111,7 @@
                        reg = <0x0>;
                        enable-method = "psci";
                        capacity-dmips-mhz = <485>;
-                       clocks = <&scmi_clk ARMCLK_L>;
+                       clocks = <&scmi_clk SCMI_ARMCLK_L>;
                        operating-points-v2 = <&cluster0_opp_table>;
                        #cooling-cells = <2>;
                        dynamic-power-coefficient = <120>;
@@ -124,7 +124,7 @@
                        reg = <0x1>;
                        enable-method = "psci";
                        capacity-dmips-mhz = <485>;
-                       clocks = <&scmi_clk ARMCLK_L>;
+                       clocks = <&scmi_clk SCMI_ARMCLK_L>;
                        operating-points-v2 = <&cluster0_opp_table>;
                        cpu-idle-states = <&CPU_SLEEP>;
                };
@@ -135,7 +135,7 @@
                        reg = <0x2>;
                        enable-method = "psci";
                        capacity-dmips-mhz = <485>;
-                       clocks = <&scmi_clk ARMCLK_L>;
+                       clocks = <&scmi_clk SCMI_ARMCLK_L>;
                        operating-points-v2 = <&cluster0_opp_table>;
                        cpu-idle-states = <&CPU_SLEEP>;
                };
@@ -146,7 +146,7 @@
                        reg = <0x3>;
                        enable-method = "psci";
                        capacity-dmips-mhz = <485>;
-                       clocks = <&scmi_clk ARMCLK_L>;
+                       clocks = <&scmi_clk SCMI_ARMCLK_L>;
                        operating-points-v2 = <&cluster0_opp_table>;
                        cpu-idle-states = <&CPU_SLEEP>;
                };
@@ -157,7 +157,7 @@
                        reg = <0x100>;
                        enable-method = "psci";
                        capacity-dmips-mhz = <1024>;
-                       clocks = <&scmi_clk ARMCLK_B>;
+                       clocks = <&scmi_clk SCMI_ARMCLK_B>;
                        operating-points-v2 = <&cluster1_opp_table>;
                        #cooling-cells = <2>;
                        dynamic-power-coefficient = <320>;
@@ -170,7 +170,7 @@
                        reg = <0x101>;
                        enable-method = "psci";
                        capacity-dmips-mhz = <1024>;
-                       clocks = <&scmi_clk ARMCLK_B>;
+                       clocks = <&scmi_clk SCMI_ARMCLK_B>;
                        operating-points-v2 = <&cluster1_opp_table>;
                        cpu-idle-states = <&CPU_SLEEP>;
                };
@@ -181,7 +181,7 @@
                        reg = <0x102>;
                        enable-method = "psci";
                        capacity-dmips-mhz = <1024>;
-                       clocks = <&scmi_clk ARMCLK_B>;
+                       clocks = <&scmi_clk SCMI_ARMCLK_B>;
                        operating-points-v2 = <&cluster1_opp_table>;
                        cpu-idle-states = <&CPU_SLEEP>;
                };
@@ -192,7 +192,7 @@
                        reg = <0x103>;
                        enable-method = "psci";
                        capacity-dmips-mhz = <1024>;
-                       clocks = <&scmi_clk ARMCLK_B>;
+                       clocks = <&scmi_clk SCMI_ARMCLK_B>;
                        operating-points-v2 = <&cluster1_opp_table>;
                        cpu-idle-states = <&CPU_SLEEP>;
                };
@@ -932,7 +932,7 @@
                gpu: gpu@27800000 {
                        compatible = "rockchip,rk3576-mali", "arm,mali-bifrost";
                        reg = <0x0 0x27800000 0x0 0x200000>;
-                       assigned-clocks = <&scmi_clk CLK_GPU>;
+                       assigned-clocks = <&scmi_clk SCMI_CLK_GPU>;
                        assigned-clock-rates = <198000000>;
                        clocks = <&cru CLK_GPU>;
                        clock-names = "core";