arm64: dts: rk3399-puma: Move u-boot properties into -u-boot.dtsi

Move U-Boot specific properties into rk3399-puma u-boot
specific dtsi file.

This would help to sync the devicetrees from Linux whenever
required instead of adding specific nodes.

Cc: Peter Robinson <pbrobinson@gmail.com>
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>

diff --git a/arch/arm/dts/rk3399-puma-u-boot.dtsi b/arch/arm/dts/rk3399-puma-u-boot.dtsi
index 52f62b5d39ed2399718a0e91f5fc51fd1d8cb2d2..e66477922779d123d86c9ab16ee6913ab8401266 100644 (file)
--- a/arch/arm/dts/rk3399-puma-u-boot.dtsi
+++ b/arch/arm/dts/rk3399-puma-u-boot.dtsi
@@ -22,3 +22,19 @@
        };
 
 };
+
+&bios_enable {
+       u-boot,dm-pre-reloc;
+};
+
+&gpio1 {
+       u-boot,dm-pre-reloc;
+};
+
+&gpio3 {
+       u-boot,dm-pre-reloc;
+};
+
+&spiflash {
+       u-boot,dm-pre-reloc;
+};

diff --git a/arch/arm/dts/rk3399-puma.dtsi b/arch/arm/dts/rk3399-puma.dtsi
index 558b6337dfeca20d89c65d27b8b2cb5c84a2f463..246a892cb7cb124ab4845d77be9739b9a8fabdc3 100644 (file)
--- a/arch/arm/dts/rk3399-puma.dtsi
+++ b/arch/arm/dts/rk3399-puma.dtsi
@@ -91,7 +91,6 @@
         */
        bios_enable: bios_enable {
                compatible = "regulator-fixed";
-               u-boot,dm-pre-reloc;
                regulator-name = "bios_enable";
                enable-active-high;
                gpio = <&gpio3 RK_PD5 GPIO_ACTIVE_LOW>;
@@ -520,14 +519,6 @@
        status = "okay";
 };
 
-&gpio1 {
-       u-boot,dm-pre-reloc;
-};
-
-&gpio3 {
-       u-boot,dm-pre-reloc;
-};
-
 &pinctrl {
        /* Pins that are not explicitely used by any devices */
        pinctrl-names = "default";
@@ -633,8 +624,6 @@
        #size-cells = <0>;
 
        spiflash: w25q32dw@0 {
-               u-boot,dm-pre-reloc;
-
                compatible = "jedec,spi-nor";
                reg = <0>;
                spi-max-frequency = <49500000>;