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

ARM: dts: imx23: Fix memory node duplication 



Boards based on imx23 have duplicate memory nodes:

- One coming from the board dts file: memory@

- One coming from the imx23.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 07a4b460

arch/arm/boot/dts/imx23-evk.dts

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
	compatible = "fsl,imx23-evk", "fsl,imx23";



	memory@40000000 {

		device_type = "memory";

		reg = <0x40000000 0x08000000>;

	};

arch/arm/boot/dts/imx23-olinuxino.dts

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
	compatible = "olimex,imx23-olinuxino", "fsl,imx23";



	memory@40000000 {

		device_type = "memory";

		reg = <0x40000000 0x04000000>;

	};

arch/arm/boot/dts/imx23-sansa.dts

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ 
	compatible = "sandisk,sansa_fuze_plus", "fsl,imx23";



	memory@40000000 {

		device_type = "memory";

		reg = <0x40000000 0x04000000>;

	};

arch/arm/boot/dts/imx23-stmp378x_devb.dts

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
	compatible = "fsl,stmp378x-devb", "fsl,imx23";



	memory@40000000 {

		device_type = "memory";

		reg = <0x40000000 0x04000000>;

	};

arch/arm/boot/dts/imx23-xfi3.dts

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ 
	compatible = "creative,x-fi3", "fsl,imx23";



	memory@40000000 {

		device_type = "memory";

		reg = <0x40000000 0x04000000>;

	};

CRA Git | Maintained and supported by SUSTech CRA and CCSE