All RK3588 barebox-specific devicetree nodes can be placed
into one file. The CPU variant-specific split rk3588{s/j}.dtsi
can be used later if needed.
Signed-off-by: Alexander Shiyan <eagle.alexander...@gmail.com>
---
arch/arm/dts/rk3588.dtsi | 13 ++++++++++---
arch/arm/dts/rk3588s.dtsi | 12 ------------
2 files changed, 10 insertions(+), 15 deletions(-)
delete mode 100644 arch/arm/dts/rk3588s.dtsi
diff --git a/arch/arm/dts/rk3588.dtsi b/arch/arm/dts/rk3588.dtsi
index 0aef30eaff..667dd0c5a8 100644
--- a/arch/arm/dts/rk3588.dtsi
+++ b/arch/arm/dts/rk3588.dtsi
@@ -1,7 +1,14 @@
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-#include <dt-bindings/phy/phy.h>
-#include "rk3588s.dtsi"
-
/ {
+ dmc: memory-controller {
+ compatible = "rockchip,rk3588-dmc";
+ rockchip,pmu = <&pmu1grf>;
+ };
+};
+
+&scmi_clk {
+ assigned-clocks = <&scmi_clk SCMI_CLK_CPUB01>,
+ <&scmi_clk SCMI_CLK_CPUB23>;
+ assigned-clock-rates = <816000000>, <816000000>;
};
diff --git a/arch/arm/dts/rk3588s.dtsi b/arch/arm/dts/rk3588s.dtsi
deleted file mode 100644
index 6572588ad6..0000000000
--
2.39.1
