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

ARM: dts: imx51: Fix memory node duplication 



Boards based on imx51 have duplicate memory nodes:

- One coming from the board dts file: memory@

- One coming from the imx51.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 4951c2da

arch/arm/boot/dts/imx51-apf51.dts

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ / { 
	compatible = "armadeus,imx51-apf51", "fsl,imx51";



	memory@90000000 {

		device_type = "memory";

		reg = <0x90000000 0x20000000>;

	};

arch/arm/boot/dts/imx51-babbage.dts

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



	memory@90000000 {

		device_type = "memory";

		reg = <0x90000000 0x20000000>;

	};

arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ / { 
	compatible = "digi,connectcore-ccxmx51-som", "fsl,imx51";



	memory@90000000 {

		device_type = "memory";

		reg = <0x90000000 0x08000000>;

	};

};

arch/arm/boot/dts/imx51-eukrea-cpuimx51.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ / { 
	compatible = "eukrea,cpuimx51", "fsl,imx51";



	memory@90000000 {

		device_type = "memory";

		reg = <0x90000000 0x10000000>; /* 256M */

	};

};

arch/arm/boot/dts/imx51-ts4800.dts

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



	memory@90000000 {

		device_type = "memory";

		reg = <0x90000000 0x10000000>;

	};