Skip to contentSkip to conversation

ARM: dts: rockchip: update rk3xxx.dtsi

PATCH New Johan Jonker 1 participant 1 message Jun 21, 2021 Arm (32-bit)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: dts: rockchip: update rk3xxx.dtsi

In the Linux DT the file rk3xxx.dtsi is shared between rk3066 and rk3188. This file has recently had some updates. For a future rk3066 support in U-boot this file must also update. Move U-boot specific things in a rk3xxx-u-boot.dtsi file.

---
 arch/arm/dts/rk3188-radxarock.dts |   4 +
 arch/arm/dts/rk3188.dtsi          |   2 +-
 arch/arm/dts/rk3xxx-u-boot.dtsi   |  37 +++++++
 arch/arm/dts/rk3xxx.dtsi          | 203 ++++++++++++++++++++++++--------------
 4 files changed, 171 insertions(+), 75 deletions(-)
 create mode 100644 arch/arm/dts/rk3xxx-u-boot.dtsi
arch/arm/dts/rk3188-radxarock.dts +4 -0
index 61367126ba..10527a052d 100644
@@ -12,6 +12,10 @@
 	model = "Radxa Rock";
 	compatible = "radxa,rock", "rockchip,rk3188";
 
+	aliases {
+		mmc0 = &mmc0;
+	};
+
 	chosen {
 /*		stdout-path = &uart2; */
 		stdout-path = "serial2:115200n8";
arch/arm/dts/rk3188.dtsi +1 -1
index 7bcca6a02d..d925d439d2 100644
@@ -7,7 +7,7 @@
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/pinctrl/rockchip.h>
 #include <dt-bindings/clock/rk3188-cru.h>
-#include "rk3xxx.dtsi"
+#include "rk3xxx-u-boot.dtsi"
 
 / {
 	compatible = "rockchip,rk3188";
arch/arm/dts/rk3xxx-u-boot.dtsi new file +37 -0
new file mode 100644
index 0000000000..160dcd43e4
@@ -0,0 +1,37 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+
+#include "rk3xxx.dtsi"
+
+/ {
+	noc: syscon@10128000 {
+		compatible = "rockchip,rk3188-noc", "syscon";
+		reg = <0x10128000 0x2000>;
+		u-boot,dm-spl;
+	};
+
+	dmc: dmc@20020000 {
+		/* unreviewed u-boot-specific binding */
+		compatible = "rockchip,rk3188-dmc", "syscon";
+		reg = <0x20020000 0x3fc
+		       0x20040000 0x294>;
+		clocks = <&cru PCLK_DDRUPCTL>, <&cru PCLK_PUBL>;
+		clock-names = "pclk_ddrupctl", "pclk_publ";
+		rockchip,cru = <&cru>;
+		rockchip,grf = <&grf>;
+		rockchip,pmu = <&pmu>;
+		rockchip,noc = <&noc>;
+		u-boot,dm-spl;
+	};
+};
+
+&grf {
+	u-boot,dm-spl;
+};
+
+&pmu {
+	u-boot,dm-spl;
+};
+
+&uart2 {
+	clock-frequency = <24000000>;
+};
arch/arm/dts/rk3xxx.dtsi +129 -74

313 lines not on this page · raw message

Signature · 1 line
2.11.0