From: Marek Vasut <marek.vasut+renesas@gmail.com>
Date: Fri, 16 Feb 2018 23:31:19 +0000 (+0100)
Subject: ARM: dts: rmobile: Move the u-boot,dm-pre-reloc into u-boot DTS on porter
X-Git-Tag: v2018.03-rc3~9^2~7
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=8a41f6887056ef4aff1c5481f00d6e29fafd68bf;p=u-boot

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 <marek.vasut+renesas@gmail.com>
Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
---

diff --git a/arch/arm/dts/r8a7791-porter-u-boot.dts b/arch/arm/dts/r8a7791-porter-u-boot.dts
index 987d0e4035..922024883c 100644
--- 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 3d47daa08b..bc93bb24e4 100644
--- 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";
 };