Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Rob Herring <robh@kernel.org>
Signed-off-by: Fabio Estevam <festevam@gmail.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

authored by

Fabio Estevam and committed by
Shawn Guo
59d8bb36 38715dcd

+3 -2
+1
arch/arm/boot/dts/imx25-eukrea-cpuimx25.dtsi
··· 18 18 compatible = "eukrea,cpuimx25", "fsl,imx25"; 19 19 20 20 memory@80000000 { 21 + device_type = "memory"; 21 22 reg = <0x80000000 0x4000000>; /* 64M */ 22 23 }; 23 24 };
+1
arch/arm/boot/dts/imx25-karo-tx25.dts
··· 37 37 }; 38 38 39 39 memory@80000000 { 40 + device_type = "memory"; 40 41 reg = <0x80000000 0x02000000 0x90000000 0x02000000>; 41 42 }; 42 43 };
+1
arch/arm/boot/dts/imx25-pdk.dts
··· 12 12 compatible = "fsl,imx25-pdk", "fsl,imx25"; 13 13 14 14 memory@80000000 { 15 + device_type = "memory"; 15 16 reg = <0x80000000 0x4000000>; 16 17 }; 17 18
-2
arch/arm/boot/dts/imx25.dtsi
··· 12 12 * The decompressor and also some bootloaders rely on a 13 13 * pre-existing /chosen node to be available to insert the 14 14 * command line and merge other ATAGS info. 15 - * Also for U-Boot there must be a pre-existing /memory node. 16 15 */ 17 16 chosen {}; 18 - memory { device_type = "memory"; }; 19 17 20 18 aliases { 21 19 ethernet0 = &fec;