Commit 87810bda authored by Cristian Ciocaltea's avatar Cristian Ciocaltea Committed by Heiko Stuebner

arm64: dts: rockchip: Fix SCMI assigned clocks on rk3588s

Since commit df4fdd0d ("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: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
Signed-off-by: default avatarCristian Ciocaltea <cristian.ciocaltea@collabora.com>
Link: https://lore.kernel.org/r/20230402095054.384739-2-cristian.ciocaltea@collabora.comSigned-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
parent 32641b8a
...@@ -60,6 +60,8 @@ cpu_l0: cpu@0 { ...@@ -60,6 +60,8 @@ cpu_l0: cpu@0 {
enable-method = "psci"; enable-method = "psci";
capacity-dmips-mhz = <530>; capacity-dmips-mhz = <530>;
clocks = <&scmi_clk SCMI_CLK_CPUL>; clocks = <&scmi_clk SCMI_CLK_CPUL>;
assigned-clocks = <&scmi_clk SCMI_CLK_CPUL>;
assigned-clock-rates = <816000000>;
cpu-idle-states = <&CPU_SLEEP>; cpu-idle-states = <&CPU_SLEEP>;
i-cache-size = <32768>; i-cache-size = <32768>;
i-cache-line-size = <64>; i-cache-line-size = <64>;
...@@ -136,6 +138,8 @@ cpu_b0: cpu@400 { ...@@ -136,6 +138,8 @@ cpu_b0: cpu@400 {
enable-method = "psci"; enable-method = "psci";
capacity-dmips-mhz = <1024>; capacity-dmips-mhz = <1024>;
clocks = <&scmi_clk SCMI_CLK_CPUB01>; clocks = <&scmi_clk SCMI_CLK_CPUB01>;
assigned-clocks = <&scmi_clk SCMI_CLK_CPUB01>;
assigned-clock-rates = <816000000>;
cpu-idle-states = <&CPU_SLEEP>; cpu-idle-states = <&CPU_SLEEP>;
i-cache-size = <65536>; i-cache-size = <65536>;
i-cache-line-size = <64>; i-cache-line-size = <64>;
...@@ -174,6 +178,8 @@ cpu_b2: cpu@600 { ...@@ -174,6 +178,8 @@ cpu_b2: cpu@600 {
enable-method = "psci"; enable-method = "psci";
capacity-dmips-mhz = <1024>; capacity-dmips-mhz = <1024>;
clocks = <&scmi_clk SCMI_CLK_CPUB23>; clocks = <&scmi_clk SCMI_CLK_CPUB23>;
assigned-clocks = <&scmi_clk SCMI_CLK_CPUB23>;
assigned-clock-rates = <816000000>;
cpu-idle-states = <&CPU_SLEEP>; cpu-idle-states = <&CPU_SLEEP>;
i-cache-size = <65536>; i-cache-size = <65536>;
i-cache-line-size = <64>; i-cache-line-size = <64>;
...@@ -304,10 +310,6 @@ scmi: scmi { ...@@ -304,10 +310,6 @@ scmi: scmi {
scmi_clk: protocol@14 { scmi_clk: protocol@14 {
reg = <0x14>; reg = <0x14>;
assigned-clocks = <&scmi_clk SCMI_CLK_CPUB01>,
<&scmi_clk SCMI_CLK_CPUB23>;
assigned-clock-rates = <1200000000>,
<1200000000>;
#clock-cells = <1>; #clock-cells = <1>;
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment