Skip to content

Commit 87810bd

Browse files
cristiccmmind
authored andcommitted
arm64: dts: rockchip: Fix SCMI assigned clocks on rk3588s
Since commit df4fdd0 ("dt-bindings: firmware: arm,scmi: Restrict protocol child node properties") the following dtbs_check warning is shown: rk3588-rock-5b.dtb: scmi: protocol@14: Unevaluated properties are not allowed ('assigned-clock-rates', 'assigned-clocks' were unexpected) Because adding the missing properties to firmware/arm,scmi.yaml binding document was not an acceptable solution, move SCMI_CLK_CPUB01 and SCMI_CLK_CPUB23 assigned clocks to the related CPU nodes and also add the missing SCMI_CLK_CPUL. Additionally, adjust frequency to 816 MHz for all the above mentioned assigned clocks, in order to match the firmware defaults. Suggested-by: Sebastian Reichel <[email protected]> Signed-off-by: Cristian Ciocaltea <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Heiko Stuebner <[email protected]>
1 parent 32641b8 commit 87810bd

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@
6060
enable-method = "psci";
6161
capacity-dmips-mhz = <530>;
6262
clocks = <&scmi_clk SCMI_CLK_CPUL>;
63+
assigned-clocks = <&scmi_clk SCMI_CLK_CPUL>;
64+
assigned-clock-rates = <816000000>;
6365
cpu-idle-states = <&CPU_SLEEP>;
6466
i-cache-size = <32768>;
6567
i-cache-line-size = <64>;
@@ -136,6 +138,8 @@
136138
enable-method = "psci";
137139
capacity-dmips-mhz = <1024>;
138140
clocks = <&scmi_clk SCMI_CLK_CPUB01>;
141+
assigned-clocks = <&scmi_clk SCMI_CLK_CPUB01>;
142+
assigned-clock-rates = <816000000>;
139143
cpu-idle-states = <&CPU_SLEEP>;
140144
i-cache-size = <65536>;
141145
i-cache-line-size = <64>;
@@ -174,6 +178,8 @@
174178
enable-method = "psci";
175179
capacity-dmips-mhz = <1024>;
176180
clocks = <&scmi_clk SCMI_CLK_CPUB23>;
181+
assigned-clocks = <&scmi_clk SCMI_CLK_CPUB23>;
182+
assigned-clock-rates = <816000000>;
177183
cpu-idle-states = <&CPU_SLEEP>;
178184
i-cache-size = <65536>;
179185
i-cache-line-size = <64>;
@@ -304,10 +310,6 @@
304310

305311
scmi_clk: protocol@14 {
306312
reg = <0x14>;
307-
assigned-clocks = <&scmi_clk SCMI_CLK_CPUB01>,
308-
<&scmi_clk SCMI_CLK_CPUB23>;
309-
assigned-clock-rates = <1200000000>,
310-
<1200000000>;
311313
#clock-cells = <1>;
312314
};
313315

0 commit comments

Comments
 (0)