ARM: dts: imx6qdl: Fix memory node duplication (404c0c93) · Commits · 戴 / test

Boards based on imx6qdl have duplicate memory nodes: - One coming from the board device tree file: memory@ - One coming from the imx6qdl.dtsi file. Fix the duplication by removing the memory node from the imx6qdl.dtsi file and by adding 'device_type = "memory";' in the board Device Tree. Converted using the following command: perl -p0777i -e 's/memory\@10000000 \{\n/memory\@10000000 \{\n\t\tdevice_type = \"memory\";\n/m' `find ./arch/arm/boot/dts -name "imx6*"`` Reported-by:

Rob Herring <robh@kernel.org> Signed-off-by:

Marco Franchi <marco.franchi@nxp.com> Reviewed-by:

Fabio Estevam <festevam@gmail.com> Signed-off-by:

Shawn Guo <shawnguo@kernel.org>

arch/arm/boot/dts/imx6dl-apf6dev.dts

+1 −0

Original line number	Diff line number	Diff line
		@@ -55,6 +55,7 @@
		compatible = "armadeus,imx6dl-apf6dev", "armadeus,imx6dl-apf6", "fsl,imx6dl";

		memory@10000000 {
		device_type = "memory";
		reg = <0x10000000 0x20000000>;
		};
		};

arch/arm/boot/dts/imx6dl-aristainetos2_4.dts

+1 −0

Original line number	Diff line number	Diff line
		@@ -49,6 +49,7 @@
		compatible = "fsl,imx6dl";

		memory@10000000 {
		device_type = "memory";
		reg = <0x10000000 0x40000000>;
		};

arch/arm/boot/dts/imx6dl-aristainetos2_7.dts

+1 −0

Original line number	Diff line number	Diff line
		@@ -49,6 +49,7 @@
		compatible = "fsl,imx6dl";

		memory@10000000 {
		device_type = "memory";
		reg = <0x10000000 0x40000000>;
		};

arch/arm/boot/dts/imx6dl-aristainetos_4.dts

+1 −0

Original line number	Diff line number	Diff line
		@@ -28,6 +28,7 @@
		};

		memory@10000000 {
		device_type = "memory";
		reg = <0x10000000 0x40000000>;
		};

arch/arm/boot/dts/imx6dl-aristainetos_7.dts

+1 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		compatible = "fsl,imx6dl";

		memory@10000000 {
		device_type = "memory";
		reg = <0x10000000 0x40000000>;
		};

Admin message