Commit 59d8bb36 authored by Fabio Estevam's avatar Fabio Estevam Committed by Shawn Guo
Browse files

ARM: dts: imx25: Fix memory node duplication 



Boards based on imx25 have duplicate memory nodes:

- One coming from the board dts file: memory@

- One coming from the imx25.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 38715dcd

arch/arm/boot/dts/imx25-eukrea-cpuimx25.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
	compatible = "eukrea,cpuimx25", "fsl,imx25";



	memory@80000000 {

		device_type = "memory";

		reg = <0x80000000 0x4000000>; /* 64M */

	};

};

arch/arm/boot/dts/imx25-karo-tx25.dts

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



	memory@80000000 {

		device_type = "memory";

		reg = <0x80000000 0x02000000 0x90000000 0x02000000>;

	};

};

arch/arm/boot/dts/imx25-pdk.dts

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
	compatible = "fsl,imx25-pdk", "fsl,imx25";



	memory@80000000 {

		device_type = "memory";

		reg = <0x80000000 0x4000000>;

	};

arch/arm/boot/dts/imx25.dtsi

+0 −2
Original line number Diff line number Diff line
@@ -12,10 +12,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 {

		ethernet0 = &fec;

CRA Git | Maintained and supported by SUSTech CRA and CCSE