Commit e8fd17b9 authored by Fabio Estevam's avatar Fabio Estevam Committed by Shawn Guo
Browse files

ARM: dts: imx53: Fix memory node duplication 



Boards based on imx53 have duplicate memory nodes:

- One coming from the board dts file: memory@

- One coming from the imx53.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: default avatarRob Herring <robh@kernel.org>
Signed-off-by: default avatarFabio Estevam <festevam@gmail.com>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent 6a968116

arch/arm/boot/dts/imx53-ard.dts

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ / { 
	compatible = "fsl,imx53-ard", "fsl,imx53";



	memory@70000000 {

		device_type = "memory";

		reg = <0x70000000 0x40000000>;

	};

arch/arm/boot/dts/imx53-cx9020.dts

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ chosen { 
	};



	memory@70000000 {

		device_type = "memory";

		reg = <0x70000000 0x20000000>,

		      <0xb0000000 0x20000000>;

	};

arch/arm/boot/dts/imx53-m53.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ / { 
	compatible = "aries,imx53-m53", "denx,imx53-m53", "fsl,imx53";



	memory@70000000 {

		device_type = "memory";

		reg = <0x70000000 0x20000000>,

		      <0xb0000000 0x20000000>;

	};

arch/arm/boot/dts/imx53-qsb-common.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ chosen { 
	};



	memory@70000000 {

		device_type = "memory";

		reg = <0x70000000 0x20000000>,

		      <0xb0000000 0x20000000>;

	};

arch/arm/boot/dts/imx53-smd.dts

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ / { 
	compatible = "fsl,imx53-smd", "fsl,imx53";



	memory@70000000 {

		device_type = "memory";

		reg = <0x70000000 0x40000000>;

	};