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

ARM: dts: imx27: Fix memory node duplication

Boards based on imx27 have duplicate memory nodes:

- One coming from the board dts file: memory@

- One coming from the imx27.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
38715dcd 62864d56

+5 -2
+1
arch/arm/boot/dts/imx27-apf27.dts
··· 20 20 compatible = "armadeus,imx27-apf27", "fsl,imx27"; 21 21 22 22 memory@a0000000 { 23 + device_type = "memory"; 23 24 reg = <0xa0000000 0x04000000>; 24 25 }; 25 26 };
+1
arch/arm/boot/dts/imx27-eukrea-cpuimx27.dtsi
··· 17 17 compatible = "eukrea,cpuimx27", "fsl,imx27"; 18 18 19 19 memory@a0000000 { 20 + device_type = "memory"; 20 21 reg = <0xa0000000 0x04000000>; 21 22 }; 22 23
+1
arch/arm/boot/dts/imx27-pdk.dts
··· 10 10 compatible = "fsl,imx27-pdk", "fsl,imx27"; 11 11 12 12 memory@a0000000 { 13 + device_type = "memory"; 13 14 reg = <0xa0000000 0x08000000>; 14 15 }; 15 16
+1
arch/arm/boot/dts/imx27-phytec-phycard-s-som.dtsi
··· 18 18 compatible = "phytec,imx27-pca100", "fsl,imx27"; 19 19 20 20 memory@a0000000 { 21 + device_type = "memory"; 21 22 reg = <0xa0000000 0x08000000>; /* 128MB */ 22 23 }; 23 24 };
+1
arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi
··· 17 17 compatible = "phytec,imx27-pcm038", "fsl,imx27"; 18 18 19 19 memory@a0000000 { 20 + device_type = "memory"; 20 21 reg = <0xa0000000 0x08000000>; 21 22 }; 22 23
-2
arch/arm/boot/dts/imx27.dtsi
··· 16 16 * The decompressor and also some bootloaders rely on a 17 17 * pre-existing /chosen node to be available to insert the 18 18 * command line and merge other ATAGS info. 19 - * Also for U-Boot there must be a pre-existing /memory node. 20 19 */ 21 20 chosen {}; 22 - memory { device_type = "memory"; }; 23 21 24 22 aliases { 25 23 ethernet0 = &fec;