From 8a41f6887056ef4aff1c5481f00d6e29fafd68bf Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Sat, 17 Feb 2018 00:31:19 +0100 Subject: [PATCH] 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 Cc: Nobuhiro Iwamatsu --- arch/arm/dts/r8a7791-porter-u-boot.dts | 4 ++++ arch/arm/dts/r8a7791-porter.dts | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) 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"; }; -- 2.39.5