Skip to content

Commit b5cb721

Browse files
Nicolas Frattarolimmind
authored andcommitted
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: 57b1ce9 ("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>
1 parent 28699ca commit b5cb721

1 file changed

Lines changed: 9 additions & 9 deletions

File tree

arch/arm64/boot/dts/rockchip/rk3576.dtsi

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111
reg = <0x0>;
112112
enable-method = "psci";
113113
capacity-dmips-mhz = <485>;
114-
clocks = <&scmi_clk ARMCLK_L>;
114+
clocks = <&scmi_clk SCMI_ARMCLK_L>;
115115
operating-points-v2 = <&cluster0_opp_table>;
116116
#cooling-cells = <2>;
117117
dynamic-power-coefficient = <120>;
@@ -124,7 +124,7 @@
124124
reg = <0x1>;
125125
enable-method = "psci";
126126
capacity-dmips-mhz = <485>;
127-
clocks = <&scmi_clk ARMCLK_L>;
127+
clocks = <&scmi_clk SCMI_ARMCLK_L>;
128128
operating-points-v2 = <&cluster0_opp_table>;
129129
cpu-idle-states = <&CPU_SLEEP>;
130130
};
@@ -135,7 +135,7 @@
135135
reg = <0x2>;
136136
enable-method = "psci";
137137
capacity-dmips-mhz = <485>;
138-
clocks = <&scmi_clk ARMCLK_L>;
138+
clocks = <&scmi_clk SCMI_ARMCLK_L>;
139139
operating-points-v2 = <&cluster0_opp_table>;
140140
cpu-idle-states = <&CPU_SLEEP>;
141141
};
@@ -146,7 +146,7 @@
146146
reg = <0x3>;
147147
enable-method = "psci";
148148
capacity-dmips-mhz = <485>;
149-
clocks = <&scmi_clk ARMCLK_L>;
149+
clocks = <&scmi_clk SCMI_ARMCLK_L>;
150150
operating-points-v2 = <&cluster0_opp_table>;
151151
cpu-idle-states = <&CPU_SLEEP>;
152152
};
@@ -157,7 +157,7 @@
157157
reg = <0x100>;
158158
enable-method = "psci";
159159
capacity-dmips-mhz = <1024>;
160-
clocks = <&scmi_clk ARMCLK_B>;
160+
clocks = <&scmi_clk SCMI_ARMCLK_B>;
161161
operating-points-v2 = <&cluster1_opp_table>;
162162
#cooling-cells = <2>;
163163
dynamic-power-coefficient = <320>;
@@ -170,7 +170,7 @@
170170
reg = <0x101>;
171171
enable-method = "psci";
172172
capacity-dmips-mhz = <1024>;
173-
clocks = <&scmi_clk ARMCLK_B>;
173+
clocks = <&scmi_clk SCMI_ARMCLK_B>;
174174
operating-points-v2 = <&cluster1_opp_table>;
175175
cpu-idle-states = <&CPU_SLEEP>;
176176
};
@@ -181,7 +181,7 @@
181181
reg = <0x102>;
182182
enable-method = "psci";
183183
capacity-dmips-mhz = <1024>;
184-
clocks = <&scmi_clk ARMCLK_B>;
184+
clocks = <&scmi_clk SCMI_ARMCLK_B>;
185185
operating-points-v2 = <&cluster1_opp_table>;
186186
cpu-idle-states = <&CPU_SLEEP>;
187187
};
@@ -192,7 +192,7 @@
192192
reg = <0x103>;
193193
enable-method = "psci";
194194
capacity-dmips-mhz = <1024>;
195-
clocks = <&scmi_clk ARMCLK_B>;
195+
clocks = <&scmi_clk SCMI_ARMCLK_B>;
196196
operating-points-v2 = <&cluster1_opp_table>;
197197
cpu-idle-states = <&CPU_SLEEP>;
198198
};
@@ -932,7 +932,7 @@
932932
gpu: gpu@27800000 {
933933
compatible = "rockchip,rk3576-mali", "arm,mali-bifrost";
934934
reg = <0x0 0x27800000 0x0 0x200000>;
935-
assigned-clocks = <&scmi_clk CLK_GPU>;
935+
assigned-clocks = <&scmi_clk SCMI_CLK_GPU>;
936936
assigned-clock-rates = <198000000>;
937937
clocks = <&cru CLK_GPU>;
938938
clock-names = "core";

0 commit comments

Comments
 (0)