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

ARM: dts: imx6ul: Fix memory node duplication 



Boards based on imx6ul have duplicate memory nodes:

- One coming from the board dts file: memory@

- One coming from the imx6ul.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 76368cca

arch/arm/boot/dts/imx6ul-14x14-evk.dtsi

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



	memory@80000000 {

		device_type = "memory";

		reg = <0x80000000 0x20000000>;

	};

arch/arm/boot/dts/imx6ul-geam.dts

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
	compatible = "engicam,imx6ul-geam", "fsl,imx6ul";



	memory@80000000 {

		device_type = "memory";

		reg = <0x80000000 0x08000000>;

	};

arch/arm/boot/dts/imx6ul-isiot.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 


/ {

	memory@80000000 {

		device_type = "memory";

		reg = <0x80000000 0x20000000>;

	};

arch/arm/boot/dts/imx6ul-litesom.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ 
	compatible = "grinn,imx6ul-litesom", "fsl,imx6ul";



	memory@80000000 {

		device_type = "memory";

		reg = <0x80000000 0x20000000>;

	};

};

arch/arm/boot/dts/imx6ul-opos6ul.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ 


/ {

	memory@80000000 {

		device_type = "memory";

		reg = <0x80000000 0>; /* will be filled by U-Boot */

	};

CRA Git | Maintained and supported by SUSTech CRA and CCSE