[U-Boot] [PATCH v3 4/8] rockchip: dts: tinker: migrate the dm-pre-reloc tag into -u-boot dts

[Kever Yang]

Migrate all the "u-boot,dm-pre-reloc" tag from rk3288-tinker.dts
into rk3288-tinker-u-boot.dtsi.
When both board level and soc level '-u-boot.dtsi' files exist,
we need to include the soc level 'rk3288-u-boot.dtsi' manually.

---

Changes in v3:
- include "rk3288-u-boot.dtsi" in dts.
Signed-off-by: Kever Yang <kever.yang at rock-chips.com>

Changes in v2: None

 arch/arm/dts/rk3288-tinker-u-boot.dtsi | 28 ++++++++++++++++++++++++++
 arch/arm/dts/rk3288-tinker.dts         | 20 +-----------------
 2 files changed, 29 insertions(+), 19 deletions(-)
 create mode 100644 arch/arm/dts/rk3288-tinker-u-boot.dtsi

diff --git a/arch/arm/dts/rk3288-tinker-u-boot.dtsi b/arch/arm/dts/rk3288-tinker-u-boot.dtsi
new file mode 100644
index 0000000000..69aae59f3d
--- /dev/null
+++ b/arch/arm/dts/rk3288-tinker-u-boot.dtsi
@@ -0,0 +1,28 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2019 Rockchip Electronics Co., Ltd
+ */
+
+&pinctrl {
+	u-boot,dm-pre-reloc;
+};
+
+&uart2 {
+	u-boot,dm-pre-reloc;
+};
+
+&sdmmc {
+	u-boot,dm-pre-reloc;
+};
+
+&emmc {
+	u-boot,dm-pre-reloc;
+};
+
+&gpio3 {
+	u-boot,dm-pre-reloc;
+};
+
+&gpio8 {
+	u-boot,dm-pre-reloc;
+};
diff --git a/arch/arm/dts/rk3288-tinker.dts b/arch/arm/dts/rk3288-tinker.dts
index 3edd21cc2f..d230c2ba0e 100644
--- a/arch/arm/dts/rk3288-tinker.dts
+++ b/arch/arm/dts/rk3288-tinker.dts
@@ -5,6 +5,7 @@
 
 /dts-v1/;
 #include "rk3288-tinker.dtsi"
+#include "rk3288-u-boot.dtsi"
 
 / {
 	model = "Tinker-RK3288";
@@ -28,8 +29,6 @@
 
 
 &pinctrl {
-	u-boot,dm-pre-reloc;
-
 	usb {
 		host_vbus_drv: host-vbus-drv {
 			rockchip,pins = <0 14 RK_FUNC_GPIO &pcfg_pull_none>;
@@ -42,7 +41,6 @@
 };
 
 &uart2 {
-	u-boot,dm-pre-reloc;
 	reg-shift = <2>;
 };
 
@@ -51,22 +49,6 @@
 	status = "okay";
 };
 
-&sdmmc {
-	u-boot,dm-pre-reloc;
-};
-
-&emmc {
-	u-boot,dm-pre-reloc;
-};
-
-&gpio3 {
-	u-boot,dm-pre-reloc;
-};
-
-&gpio8 {
-	u-boot,dm-pre-reloc;
-};
-
 &i2c2 {
     m24c08 at 50 {
         compatible = "at,24c08", "i2c-eeprom";
-- 
2.20.1