ARM: dts: rmobile: Move the u-boot,dm-pre-reloc into u-boot DTS on porter

Fix ommission where the u-boot,dm-pre-reloc DT bit was pulled into the
common DT, not the U-Boot specific DT part. Move it to U-Boot DT part.

Signed-off-by: Marek Vasut <[email protected]>
Cc: Nobuhiro Iwamatsu <[email protected]>

diff --git a/arch/arm/dts/r8a7791-porter-u-boot.dts b/arch/arm/dts/r8a7791-porter-u-boot.dts
index 987d0e4035c7ef1bf6f1dcf94954593b0e3233ef..922024883c2062d8e50ef6bf255f1f945ec71617 100644 (file)
--- a/arch/arm/dts/r8a7791-porter-u-boot.dts
+++ b/arch/arm/dts/r8a7791-porter-u-boot.dts
@@ -8,3 +8,7 @@
 
 #include "r8a7791-porter.dts"
 #include "r8a7791-u-boot.dtsi"
+
+&scif0 {
+       u-boot,dm-pre-reloc;
+};

diff --git a/arch/arm/dts/r8a7791-porter.dts b/arch/arm/dts/r8a7791-porter.dts
index 3d47daa08bac1ae8b030e0402744225eacc4899d..bc93bb24e4106b6d9a847dfb81cd7b38fcbc349b 100644 (file)
--- a/arch/arm/dts/r8a7791-porter.dts
+++ b/arch/arm/dts/r8a7791-porter.dts
@@ -214,7 +214,6 @@
 &scif0 {
        pinctrl-0 = <&scif0_pins>;
        pinctrl-names = "default";
-       u-boot,dm-pre-reloc;
 
        status = "okay";
 };