summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Vasut <marek.vasut+renesas@gmail.com>2018-02-17 00:31:19 +0100
committerMarek Vasut <marex@denx.de>2018-02-17 21:59:20 +0100
commit8a41f6887056ef4aff1c5481f00d6e29fafd68bf (patch)
treed2e561e1504869daf93261094a86683d7b1d69c5
parentbd650cd404b6dc870b6cc220025f35da4b31d0f4 (diff)
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>
-rw-r--r--arch/arm/dts/r8a7791-porter-u-boot.dts4
-rw-r--r--arch/arm/dts/r8a7791-porter.dts1
2 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/dts/r8a7791-porter-u-boot.dts b/arch/arm/dts/r8a7791-porter-u-boot.dts
index 987d0e4035c..922024883c2 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 3d47daa08ba..bc93bb24e41 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";
};