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

ARM: dts: imx1: Fix memory node duplication 



Boards based on imx1 have duplicate memory nodes:

- One coming from the board dts file: memory@

- One coming from the imx1.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 32018d15

arch/arm/boot/dts/imx1-ads.dts

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



	memory@8000000 {

		device_type = "memory";

		reg = <0x08000000 0x04000000>;

	};

};

arch/arm/boot/dts/imx1-apf9328.dts

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



	memory@8000000 {

		device_type = "memory";

		reg = <0x08000000 0x00800000>;

	};

};

arch/arm/boot/dts/imx1.dtsi

+0 −2
Original line number Diff line number Diff line
@@ -15,10 +15,8 @@ 
	 * The decompressor and also some bootloaders rely on a

	 * pre-existing /chosen node to be available to insert the

	 * command line and merge other ATAGS info.

	 * Also for U-Boot there must be a pre-existing /memory node.

	 */

	chosen {};

	memory { device_type = "memory"; };



	aliases {

		gpio0 = &gpio1;

CRA Git | Maintained and supported by SUSTech CRA and CCSE