Commit 013d37e4 authored by Fabio Estevam's avatar Fabio Estevam Committed by Shawn Guo
Browse files

ARM: dts: imx31: Fix memory node duplication 



Boards based on imx31 have duplicate memory nodes:

- One coming from the board dts file: memory@

- One coming from the imx31.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>
Reviewed-by: default avatarVladimir Zapolskiy <vz@mleia.com>
Tested-by: default avatarVladimir Zapolskiy <vz@mleia.com>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent d2cf9fd3

arch/arm/boot/dts/imx31-bug.dts

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ / { 
	compatible = "buglabs,imx31-bug", "fsl,imx31";



	memory@80000000 {

		device_type = "memory";

		reg = <0x80000000 0x8000000>; /* 128M */

	};

};

arch/arm/boot/dts/imx31-lite.dts

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ chosen { 
	};



	memory@80000000 {

		device_type = "memory";

		reg = <0x80000000 0x8000000>;

	};

arch/arm/boot/dts/imx31.dtsi

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