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

ARM: dts: imx6sx: Fix memory node duplication 



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: 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 750d8df6

arch/arm/boot/dts/imx6sx-nitrogen6sx.dts

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
	compatible = "boundary,imx6sx-nitrogen6sx", "fsl,imx6sx";



	memory@80000000 {

		device_type = "memory";

		reg = <0x80000000 0x40000000>;

	};

arch/arm/boot/dts/imx6sx-sabreauto.dts

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
	compatible = "fsl,imx6sx-sabreauto", "fsl,imx6sx";



	memory@80000000 {

		device_type = "memory";

		reg = <0x80000000 0x80000000>;

	};

arch/arm/boot/dts/imx6sx-sdb.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
	};



	memory@80000000 {

		device_type = "memory";

		reg = <0x80000000 0x40000000>;

	};

arch/arm/boot/dts/imx6sx-softing-vining-2000.dts

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
	};



	memory@80000000 {

		device_type = "memory";

		reg = <0x80000000 0x40000000>;

	};

arch/arm/boot/dts/imx6sx-udoo-neo-basic.dts

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ 
	compatible = "udoo,neobasic", "fsl,imx6sx";



	memory@80000000 {

		device_type = "memory";

		reg = <0x80000000 0x20000000>;

	};

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE