Skip to contentSkip to conversation

ARM: dts: imx50: Fix memory node duplicaton

PATCH New Fabio Estevam 2 participants 2 messages Nov 23, 2018 – Nov 28, 2018

Subsystems (2)
Device tree bindings Arm i.MX and Layerscape
lore
Share & tools
lore

Fabio Estevam

author reviewer
#0 lore raw

PATCH 1/1 ARM: dts: imx50: Fix memory node duplicaton

imx50-evk has duplicate memory nodes:

- One coming from the board dts file: memory@

- One coming from the imx50.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 <[email protected]>
Signed-off-by Fabio Estevam <[email protected]>
---
 arch/arm/boot/dts/imx50-evk.dts | 1 +
 arch/arm/boot/dts/imx50.dtsi    | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)
arch/arm/boot/dts/imx50-evk.dts +1 -0
index 682a997..a25da41 100644
@@ -12,6 +12,7 @@
 	compatible = "fsl,imx50-evk", "fsl,imx50";
 
 	memory at 70000000 {
+		device_type = "memory";
 		reg = <0x70000000 0x80000000>;
 	};
 };
arch/arm/boot/dts/imx50.dtsi +0 -2
index 95b7fba..8be4ff4 100644
@@ -22,10 +22,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 {
 		ethernet0 = &fec;
Signature · 1 line
2.7.4
Applied
#1 lore raw

PATCH 1/1 ARM: dts: imx50: Fix memory node duplicaton

Quoted 11 lines · Fabio Estevam

imx50-evk has duplicate memory nodes:

- One coming from the board dts file: memory@

- One coming from the imx50.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 <[email protected]>
Signed-off-by Fabio Estevam <[email protected]>

Applied, thanks.