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

ARM: dts: imx28: Fix memory node duplication

Boards based on imx28 have duplicate memory nodes:

- One coming from the board dts file: memory@

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

+17 -2
+1
arch/arm/boot/dts/imx28-apf28.dts
··· 17 17 compatible = "armadeus,imx28-apf28", "fsl,imx28"; 18 18 19 19 memory@40000000 { 20 + device_type = "memory"; 20 21 reg = <0x40000000 0x08000000>; 21 22 }; 22 23
+1
arch/arm/boot/dts/imx28-apx4devkit.dts
··· 7 7 compatible = "bluegiga,apx4devkit", "fsl,imx28"; 8 8 9 9 memory@40000000 { 10 + device_type = "memory"; 10 11 reg = <0x40000000 0x04000000>; 11 12 }; 12 13
+1
arch/arm/boot/dts/imx28-cfa10036.dts
··· 17 17 compatible = "crystalfontz,cfa10036", "fsl,imx28"; 18 18 19 19 memory@40000000 { 20 + device_type = "memory"; 20 21 reg = <0x40000000 0x08000000>; 21 22 }; 22 23
+1
arch/arm/boot/dts/imx28-duckbill-2-485.dts
··· 20 20 compatible = "i2se,duckbill-2-485", "i2se,duckbill-2", "fsl,imx28"; 21 21 22 22 memory@40000000 { 23 + device_type = "memory"; 23 24 reg = <0x40000000 0x08000000>; 24 25 }; 25 26
+1
arch/arm/boot/dts/imx28-duckbill-2-enocean.dts
··· 21 21 compatible = "i2se,duckbill-2-enocean", "i2se,duckbill-2", "fsl,imx28"; 22 22 23 23 memory@40000000 { 24 + device_type = "memory"; 24 25 reg = <0x40000000 0x08000000>; 25 26 }; 26 27
+1
arch/arm/boot/dts/imx28-duckbill-2-spi.dts
··· 24 24 }; 25 25 26 26 memory@40000000 { 27 + device_type = "memory"; 27 28 reg = <0x40000000 0x08000000>; 28 29 }; 29 30
+1
arch/arm/boot/dts/imx28-duckbill-2.dts
··· 20 20 compatible = "i2se,duckbill-2", "fsl,imx28"; 21 21 22 22 memory@40000000 { 23 + device_type = "memory"; 23 24 reg = <0x40000000 0x08000000>; 24 25 }; 25 26
+1
arch/arm/boot/dts/imx28-duckbill.dts
··· 19 19 compatible = "i2se,duckbill", "fsl,imx28"; 20 20 21 21 memory@40000000 { 22 + device_type = "memory"; 22 23 reg = <0x40000000 0x08000000>; 23 24 }; 24 25
+1
arch/arm/boot/dts/imx28-eukrea-mbmx283lc.dts
··· 24 24 compatible = "eukrea,mbmx283lc", "eukrea,mbmx28lc", "fsl,imx28"; 25 25 26 26 memory@40000000 { 27 + device_type = "memory"; 27 28 reg = <0x40000000 0x04000000>; 28 29 }; 29 30 };
+1
arch/arm/boot/dts/imx28-eukrea-mbmx287lc.dts
··· 23 23 compatible = "eukrea,mbmx287lc", "eukrea,mbmx283lc", "eukrea,mbmx28lc", "fsl,imx28"; 24 24 25 25 memory@40000000 { 26 + device_type = "memory"; 26 27 reg = <0x40000000 0x08000000>; 27 28 }; 28 29 };
+1
arch/arm/boot/dts/imx28-evk.dts
··· 10 10 compatible = "fsl,imx28-evk", "fsl,imx28"; 11 11 12 12 memory@40000000 { 13 + device_type = "memory"; 13 14 reg = <0x40000000 0x08000000>; 14 15 }; 15 16
+1
arch/arm/boot/dts/imx28-m28.dtsi
··· 16 16 compatible = "aries,m28", "denx,m28", "fsl,imx28"; 17 17 18 18 memory@40000000 { 19 + device_type = "memory"; 19 20 reg = <0x40000000 0x08000000>; 20 21 }; 21 22
+1
arch/arm/boot/dts/imx28-m28cu3.dts
··· 17 17 compatible = "msr,m28cu3", "fsl,imx28"; 18 18 19 19 memory@40000000 { 20 + device_type = "memory"; 20 21 reg = <0x40000000 0x08000000>; 21 22 }; 22 23
+1
arch/arm/boot/dts/imx28-m28evk.dts
··· 1 1 /* 2 + 2 3 * Copyright (C) 2012 Marek Vasut <marex@denx.de> 3 4 * 4 5 * The code contained herein is licensed under the GNU General Public
+1
arch/arm/boot/dts/imx28-sps1.dts
··· 17 17 compatible = "schulercontrol,imx28-sps1", "fsl,imx28"; 18 18 19 19 memory@40000000 { 20 + device_type = "memory"; 20 21 reg = <0x40000000 0x08000000>; 21 22 }; 22 23
+1
arch/arm/boot/dts/imx28-ts4600.dts
··· 20 20 compatible = "technologic,imx28-ts4600", "fsl,imx28"; 21 21 22 22 memory@40000000 { 23 + device_type = "memory"; 23 24 reg = <0x40000000 0x10000000>; /* 256MB */ 24 25 }; 25 26
+1
arch/arm/boot/dts/imx28-tx28.dts
··· 66 66 }; 67 67 68 68 memory@40000000 { 69 + device_type = "memory"; 69 70 reg = <0x40000000 0>; /* will be filled in by U-Boot */ 70 71 }; 71 72
-2
arch/arm/boot/dts/imx28.dtsi
··· 14 14 * The decompressor and also some bootloaders rely on a 15 15 * pre-existing /chosen node to be available to insert the 16 16 * command line and merge other ATAGS info. 17 - * Also for U-Boot there must be a pre-existing /memory node. 18 17 */ 19 18 chosen {}; 20 - memory { device_type = "memory"; }; 21 19 22 20 aliases { 23 21 ethernet0 = &mac0;