ARM: dts: imx23: Fix memory node duplicaton

PATCH New Fabio Estevam 2 participants 3 messages Nov 26, 2018 – Nov 28, 2018

Subsystems (3)

Device tree bindings Arm i.MX and Layerscape Arm STM32

lore

Share & tools

lore

Fabio Estevam

author reviewer

2018-11-26 12:08 UTC #0 lore raw

PATCH 1/2 ARM: dts: imx23: Fix memory node duplicaton

Boards based on imx23 have duplicate memory nodes:

- One coming from the board dts file: memory@

- One coming from the imx23.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 <[email protected]>

Signed-off-by Fabio Estevam <[email protected]>

---
 arch/arm/boot/dts/imx23-evk.dts           | 1 +
 arch/arm/boot/dts/imx23-olinuxino.dts     | 1 +
 arch/arm/boot/dts/imx23-sansa.dts         | 1 +
 arch/arm/boot/dts/imx23-stmp378x_devb.dts | 1 +
 arch/arm/boot/dts/imx23-xfi3.dts          | 1 +
 arch/arm/boot/dts/imx23.dtsi              | 2 --
 6 files changed, 5 insertions(+), 2 deletions(-)

arch/arm/boot/dts/imx23-evk.dts +1 -0

index 98efe1a..0b2701c 100644
@@ -10,6 +10,7 @@
 	compatible = "fsl,imx23-evk", "fsl,imx23";
 
 	memory at 40000000 {
+		device_type = "memory";
 		reg = <0x40000000 0x08000000>;
 	};

arch/arm/boot/dts/imx23-olinuxino.dts +1 -0

index 31b1e35..e2bac4d 100644
@@ -20,6 +20,7 @@
 	compatible = "olimex,imx23-olinuxino", "fsl,imx23";
 
 	memory at 40000000 {
+		device_type = "memory";
 		reg = <0x40000000 0x04000000>;
 	};

arch/arm/boot/dts/imx23-sansa.dts +1 -0

index faf701b..46057d9 100644
@@ -50,6 +50,7 @@
 	compatible = "sandisk,sansa_fuze_plus", "fsl,imx23";
 
 	memory at 40000000 {
+		device_type = "memory";
 		reg = <0x40000000 0x04000000>;
 	};

arch/arm/boot/dts/imx23-stmp378x_devb.dts +1 -0

index 2ff6cdf..df2a9e6 100644
@@ -17,6 +17,7 @@
 	compatible = "fsl,stmp378x-devb", "fsl,imx23";
 
 	memory at 40000000 {
+		device_type = "memory";
 		reg = <0x40000000 0x04000000>;
 	};

arch/arm/boot/dts/imx23-xfi3.dts +1 -0

index db53089..a6213c5 100644
@@ -49,6 +49,7 @@
 	compatible = "creative,x-fi3", "fsl,imx23";
 
 	memory at 40000000 {
+		device_type = "memory";
 		reg = <0x40000000 0x04000000>;
 	};

arch/arm/boot/dts/imx23.dtsi +0 -2

index ea25992..8257630 100644
@@ -13,10 +13,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 = &gpio0;

Signature · 1 line

2.7.4

Fabio Estevam

author reviewer

2018-11-26 12:08 UTC #1 lore raw

PATCH 2/2 ARM: dts: imx28: Fix memory node duplicaton

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 <[email protected]>

Signed-off-by Fabio Estevam <[email protected]>

---
 arch/arm/boot/dts/imx28-apf28.dts              | 1 +
 arch/arm/boot/dts/imx28-apx4devkit.dts         | 1 +
 arch/arm/boot/dts/imx28-cfa10036.dts           | 1 +
 arch/arm/boot/dts/imx28-duckbill-2-485.dts     | 1 +
 arch/arm/boot/dts/imx28-duckbill-2-enocean.dts | 1 +
 arch/arm/boot/dts/imx28-duckbill-2-spi.dts     | 1 +
 arch/arm/boot/dts/imx28-duckbill-2.dts         | 1 +
 arch/arm/boot/dts/imx28-duckbill.dts           | 1 +
 arch/arm/boot/dts/imx28-eukrea-mbmx283lc.dts   | 1 +
 arch/arm/boot/dts/imx28-eukrea-mbmx287lc.dts   | 1 +
 arch/arm/boot/dts/imx28-evk.dts                | 1 +
 arch/arm/boot/dts/imx28-m28.dtsi               | 1 +
 arch/arm/boot/dts/imx28-m28cu3.dts             | 1 +
 arch/arm/boot/dts/imx28-m28evk.dts             | 1 +
 arch/arm/boot/dts/imx28-sps1.dts               | 1 +
 arch/arm/boot/dts/imx28-ts4600.dts             | 1 +
 arch/arm/boot/dts/imx28-tx28.dts               | 1 +
 arch/arm/boot/dts/imx28.dtsi                   | 2 --
 18 files changed, 17 insertions(+), 2 deletions(-)

arch/arm/boot/dts/imx28-apf28.dts +1 -0

index bab7834..b6976fb 100644
@@ -17,6 +17,7 @@
 	compatible = "armadeus,imx28-apf28", "fsl,imx28";
 
 	memory at 40000000 {
+		device_type = "memory";
 		reg = <0x40000000 0x08000000>;
 	};

arch/arm/boot/dts/imx28-apx4devkit.dts +1 -0

index 6c9b498..3a184d1 100644
@@ -7,6 +7,7 @@
 	compatible = "bluegiga,apx4devkit", "fsl,imx28";
 
 	memory at 40000000 {
+		device_type = "memory";
 		reg = <0x40000000 0x04000000>;
 	};

arch/arm/boot/dts/imx28-cfa10036.dts +1 -0

index 8337ca2..d3e3622 100644
@@ -17,6 +17,7 @@
 	compatible = "crystalfontz,cfa10036", "fsl,imx28";
 
 	memory at 40000000 {
+		device_type = "memory";
 		reg = <0x40000000 0x08000000>;
 	};

arch/arm/boot/dts/imx28-duckbill-2-485.dts +1 -0

index f4f2b3d..19957c2 100644
@@ -20,6 +20,7 @@
 	compatible = "i2se,duckbill-2-485", "i2se,duckbill-2", "fsl,imx28";
 
 	memory at 40000000 {
+		device_type = "memory";
 		reg = <0x40000000 0x08000000>;
 	};

arch/arm/boot/dts/imx28-duckbill-2-enocean.dts +1 -0

index 71d0fcb..4982131 100644
@@ -21,6 +21,7 @@
 	compatible = "i2se,duckbill-2-enocean", "i2se,duckbill-2", "fsl,imx28";
 
 	memory at 40000000 {
+		device_type = "memory";
 		reg = <0x40000000 0x08000000>;
 	};

arch/arm/boot/dts/imx28-duckbill-2-spi.dts +1 -0

index 6580ec6..d38d35b 100644
@@ -24,6 +24,7 @@
 	};
 
 	memory at 40000000 {
+		device_type = "memory";
 		reg = <0x40000000 0x08000000>;
 	};

arch/arm/boot/dts/imx28-duckbill-2.dts +1 -0

index 693634e..38160fb 100644
@@ -20,6 +20,7 @@
 	compatible = "i2se,duckbill-2", "fsl,imx28";
 
 	memory at 40000000 {
+		device_type = "memory";
 		reg = <0x40000000 0x08000000>;
 	};

arch/arm/boot/dts/imx28-duckbill.dts +1 -0

index 16f5244..7139c07 100644
@@ -19,6 +19,7 @@
 	compatible = "i2se,duckbill", "fsl,imx28";
 
 	memory at 40000000 {
+		device_type = "memory";
 		reg = <0x40000000 0x08000000>;
 	};

arch/arm/boot/dts/imx28-eukrea-mbmx283lc.dts +1 -0

index b70f334..28dab6d 100644
@@ -24,6 +24,7 @@
 	compatible = "eukrea,mbmx283lc", "eukrea,mbmx28lc", "fsl,imx28";
 
 	memory at 40000000 {
+		device_type = "memory";
 		reg = <0x40000000 0x04000000>;
 	};
 };

arch/arm/boot/dts/imx28-eukrea-mbmx287lc.dts +1 -0

index 65efb78..7c3d552 100644
@@ -23,6 +23,7 @@
 	compatible = "eukrea,mbmx287lc", "eukrea,mbmx283lc", "eukrea,mbmx28lc", "fsl,imx28";
 
 	memory at 40000000 {
+		device_type = "memory";
 		reg = <0x40000000 0x08000000>;
 	};
 };

arch/arm/boot/dts/imx28-evk.dts +1 -0

index 5778300..96c1d10 100644
@@ -10,6 +10,7 @@
 	compatible = "fsl,imx28-evk", "fsl,imx28";
 
 	memory at 40000000 {
+		device_type = "memory";
 		reg = <0x40000000 0x08000000>;
 	};

arch/arm/boot/dts/imx28-m28.dtsi +1 -0

index 0ec415e..298ad28 100644
@@ -16,6 +16,7 @@
 	compatible = "aries,m28", "denx,m28", "fsl,imx28";
 
 	memory at 40000000 {
+		device_type = "memory";
 		reg = <0x40000000 0x08000000>;
 	};

arch/arm/boot/dts/imx28-m28cu3.dts +1 -0

index 8883d36..ece3310 100644
@@ -17,6 +17,7 @@
 	compatible = "msr,m28cu3", "fsl,imx28";
 
 	memory at 40000000 {
+		device_type = "memory";
 		reg = <0x40000000 0x08000000>;
 	};

arch/arm/boot/dts/imx28-m28evk.dts +1 -0

index 893886d..7d64301 100644
@@ -1,4 +1,5 @@
 /*
+
  * Copyright (C) 2012 Marek Vasut <[email protected]>
  *
  * The code contained herein is licensed under the GNU General Public

arch/arm/boot/dts/imx28-sps1.dts +1 -0

index ea9212f..42c88a6 100644
@@ -17,6 +17,7 @@
 	compatible = "schulercontrol,imx28-sps1", "fsl,imx28";
 
 	memory at 40000000 {
+		device_type = "memory";
 		reg = <0x40000000 0x08000000>;
 	};

arch/arm/boot/dts/imx28-ts4600.dts +1 -0

index dccdd6b..e3fd411 100644
@@ -20,6 +20,7 @@
 	compatible = "technologic,imx28-ts4600", "fsl,imx28";
 
 	memory at 40000000 {
+		device_type = "memory";
 		reg = <0x40000000 0x10000000>;   /* 256MB */
 	};

arch/arm/boot/dts/imx28-tx28.dts +1 -0

index b8f4643..164254c 100644
@@ -66,6 +66,7 @@
 	};
 
 	memory at 40000000 {
+		device_type = "memory";
 		reg = <0x40000000 0>; /* will be filled in by U-Boot */
 	};

arch/arm/boot/dts/imx28.dtsi +0 -2

index 2b7efb6..e14d8ef 100644
@@ -14,10 +14,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 = &mac0;

Signature · 1 line

2.7.4

Shawn Guo

Applied

2018-11-28 08:52 UTC #2 lore raw

PATCH 1/2 ARM: dts: imx23: Fix memory node duplicaton

In reply to Fabio Estevam

Quoted 11 lines · Fabio Estevam

Boards based on imx23 have duplicate memory nodes:
- One coming from the board dts file: memory@
- One coming from the imx23.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 <[email protected]>
Signed-off-by Fabio Estevam <[email protected]>

Applied, thanks.