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

ARM: dts: imx7: Fix memory node duplication 



Boards based on imx7 have duplicate memory nodes:

- One coming from the board dts file: memory@

- One coming from the imx7s.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 8721610a

arch/arm/boot/dts/imx7d-cl-som-imx7.dts

+2 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
	compatible = "compulab,cl-som-imx7", "fsl,imx7d";



	memory@80000000 {

		device_type = "memory";

		reg = <0x80000000 0x10000000>; /* 256 MB - minimal configuration */

	};

arch/arm/boot/dts/imx7d-colibri-emmc.dtsi

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


/ {

	memory@80000000 {

		device_type = "memory";

		reg = <0x80000000 0x40000000>;

	};

};

arch/arm/boot/dts/imx7d-colibri.dtsi

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


/ {

	memory@80000000 {

		device_type = "memory";

		reg = <0x80000000 0x20000000>;

	};

};

arch/arm/boot/dts/imx7d-nitrogen7.dts

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



	memory@80000000 {

		device_type = "memory";

		reg = <0x80000000 0x40000000>;

	};

arch/arm/boot/dts/imx7d-pico.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ 
	compatible = "technexion,imx7d-pico", "fsl,imx7d";



	memory@80000000 {

		device_type = "memory";

		reg = <0x80000000 0x80000000>;

	};