| From 21a86b306ddcd922862ef66265bc97ba87fb03e5 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 20 Nov 2018 13:59:44 -0200 |
| Subject: ARM: dts: imx6sx: Fix memory node duplication |
| |
| From: Fabio Estevam <festevam@gmail.com> |
| |
| [ Upstream commit 216f35fedd8688c8b654ebfbad18c6e64713fad7 ] |
| |
| Boards based on imx6sx have duplicate memory nodes: |
| |
| - One coming from the board dts file: memory@ |
| |
| - One coming from the imx6sx.dtsi file. |
| |
| Fix the duplication by removing the memory node from the dtsi file |
| and by adding 'device_type = "memory";' in the board dts. |
| |
| Reported-by: Rob Herring <robh@kernel.org> |
| Signed-off-by: Fabio Estevam <festevam@gmail.com> |
| Signed-off-by: Shawn Guo <shawnguo@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| arch/arm/boot/dts/imx6sx-nitrogen6sx.dts | 1 + |
| arch/arm/boot/dts/imx6sx-sabreauto.dts | 1 + |
| arch/arm/boot/dts/imx6sx-sdb.dtsi | 1 + |
| arch/arm/boot/dts/imx6sx-softing-vining-2000.dts | 1 + |
| arch/arm/boot/dts/imx6sx-udoo-neo-basic.dts | 1 + |
| arch/arm/boot/dts/imx6sx-udoo-neo-extended.dts | 1 + |
| arch/arm/boot/dts/imx6sx-udoo-neo-full.dts | 1 + |
| arch/arm/boot/dts/imx6sx.dtsi | 2 -- |
| 8 files changed, 7 insertions(+), 2 deletions(-) |
| |
| diff --git a/arch/arm/boot/dts/imx6sx-nitrogen6sx.dts b/arch/arm/boot/dts/imx6sx-nitrogen6sx.dts |
| index adb5cc7d8ce2f..832b5c5d7441a 100644 |
| --- a/arch/arm/boot/dts/imx6sx-nitrogen6sx.dts |
| +++ b/arch/arm/boot/dts/imx6sx-nitrogen6sx.dts |
| @@ -12,6 +12,7 @@ |
| compatible = "boundary,imx6sx-nitrogen6sx", "fsl,imx6sx"; |
| |
| memory@80000000 { |
| + device_type = "memory"; |
| reg = <0x80000000 0x40000000>; |
| }; |
| |
| diff --git a/arch/arm/boot/dts/imx6sx-sabreauto.dts b/arch/arm/boot/dts/imx6sx-sabreauto.dts |
| index 841a27f3198ff..48aede543612b 100644 |
| --- a/arch/arm/boot/dts/imx6sx-sabreauto.dts |
| +++ b/arch/arm/boot/dts/imx6sx-sabreauto.dts |
| @@ -11,6 +11,7 @@ |
| compatible = "fsl,imx6sx-sabreauto", "fsl,imx6sx"; |
| |
| memory@80000000 { |
| + device_type = "memory"; |
| reg = <0x80000000 0x80000000>; |
| }; |
| |
| diff --git a/arch/arm/boot/dts/imx6sx-sdb.dtsi b/arch/arm/boot/dts/imx6sx-sdb.dtsi |
| index d6d517e4922ff..91f809ed1370a 100644 |
| --- a/arch/arm/boot/dts/imx6sx-sdb.dtsi |
| +++ b/arch/arm/boot/dts/imx6sx-sdb.dtsi |
| @@ -21,6 +21,7 @@ |
| }; |
| |
| memory@80000000 { |
| + device_type = "memory"; |
| reg = <0x80000000 0x40000000>; |
| }; |
| |
| diff --git a/arch/arm/boot/dts/imx6sx-softing-vining-2000.dts b/arch/arm/boot/dts/imx6sx-softing-vining-2000.dts |
| index 252175b592475..2bc51623a8060 100644 |
| --- a/arch/arm/boot/dts/imx6sx-softing-vining-2000.dts |
| +++ b/arch/arm/boot/dts/imx6sx-softing-vining-2000.dts |
| @@ -21,6 +21,7 @@ |
| }; |
| |
| memory@80000000 { |
| + device_type = "memory"; |
| reg = <0x80000000 0x40000000>; |
| }; |
| |
| diff --git a/arch/arm/boot/dts/imx6sx-udoo-neo-basic.dts b/arch/arm/boot/dts/imx6sx-udoo-neo-basic.dts |
| index 40ccdf43dffc5..db0feb9b9f5d7 100644 |
| --- a/arch/arm/boot/dts/imx6sx-udoo-neo-basic.dts |
| +++ b/arch/arm/boot/dts/imx6sx-udoo-neo-basic.dts |
| @@ -49,6 +49,7 @@ |
| compatible = "udoo,neobasic", "fsl,imx6sx"; |
| |
| memory@80000000 { |
| + device_type = "memory"; |
| reg = <0x80000000 0x20000000>; |
| }; |
| }; |
| diff --git a/arch/arm/boot/dts/imx6sx-udoo-neo-extended.dts b/arch/arm/boot/dts/imx6sx-udoo-neo-extended.dts |
| index 42bfc8f8f7f6b..5c7a2bb9141cb 100644 |
| --- a/arch/arm/boot/dts/imx6sx-udoo-neo-extended.dts |
| +++ b/arch/arm/boot/dts/imx6sx-udoo-neo-extended.dts |
| @@ -49,6 +49,7 @@ |
| compatible = "udoo,neoextended", "fsl,imx6sx"; |
| |
| memory@80000000 { |
| + device_type = "memory"; |
| reg = <0x80000000 0x40000000>; |
| }; |
| }; |
| diff --git a/arch/arm/boot/dts/imx6sx-udoo-neo-full.dts b/arch/arm/boot/dts/imx6sx-udoo-neo-full.dts |
| index c84c877f09d49..13dfe2afaba56 100644 |
| --- a/arch/arm/boot/dts/imx6sx-udoo-neo-full.dts |
| +++ b/arch/arm/boot/dts/imx6sx-udoo-neo-full.dts |
| @@ -49,6 +49,7 @@ |
| compatible = "udoo,neofull", "fsl,imx6sx"; |
| |
| memory@80000000 { |
| + device_type = "memory"; |
| reg = <0x80000000 0x40000000>; |
| }; |
| }; |
| diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi |
| index 7b62e6fb47ebe..ae0728df542e9 100644 |
| --- a/arch/arm/boot/dts/imx6sx.dtsi |
| +++ b/arch/arm/boot/dts/imx6sx.dtsi |
| @@ -15,10 +15,8 @@ |
| * The decompressor and also some bootloaders rely on a |
| * pre-existing /chosen node to be available to insert the |
| * command line and merge other ATAGS info. |
| - * Also for U-Boot there must be a pre-existing /memory node. |
| */ |
| chosen {}; |
| - memory { device_type = "memory"; }; |
| |
| aliases { |
| can0 = &flexcan1; |
| -- |
| 2.20.1 |
| |
