rockchip: dts: tinker: migrate the dm-pre-reloc tag into -u-boot dts
authorKever Yang <kever.yang@rock-chips.com>
Mon, 1 Jul 2019 03:49:11 +0000 (11:49 +0800)
committerKever Yang <kever.yang@rock-chips.com>
Tue, 2 Jul 2019 03:49:49 +0000 (11:49 +0800)
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.

Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
arch/arm/dts/rk3288-tinker-u-boot.dtsi [new file with mode: 0644]
arch/arm/dts/rk3288-tinker.dts

diff --git a/arch/arm/dts/rk3288-tinker-u-boot.dtsi b/arch/arm/dts/rk3288-tinker-u-boot.dtsi
new file mode 100644 (file)
index 0000000..cf961b3
--- /dev/null
@@ -0,0 +1,30 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2019 Rockchip Electronics Co., Ltd
+ */
+
+#include "rk3288-u-boot.dtsi"
+
+&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;
+};
index 3edd21cc2f4b07c2d115bdbf252d0077e7f43818..94c3afe8604ef532b266ec1e59f27d66c11703b2 100644 (file)
@@ -28,8 +28,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 +40,6 @@
 };
 
 &uart2 {
-       u-boot,dm-pre-reloc;
        reg-shift = <2>;
 };
 
        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@50 {
         compatible = "at,24c08", "i2c-eeprom";