 arch/arm/boot/dts/imx51-apf51.dts                 | 1 +
 arch/arm/boot/dts/imx51-babbage.dts               | 1 +
 arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi | 1 +
 arch/arm/boot/dts/imx51-eukrea-cpuimx51.dtsi      | 1 +
 arch/arm/boot/dts/imx51-ts4800.dts                | 1 +
 arch/arm/boot/dts/imx51-zii-rdu1.dts              | 1 +
 arch/arm/boot/dts/imx51-zii-scu2-mezz.dts         | 1 +
 arch/arm/boot/dts/imx51-zii-scu3-esb.dts          | 1 +
 arch/arm/boot/dts/imx51.dtsi                      | 2 --
 9 files changed, 8 insertions(+), 2 deletions(-)

arch/arm/boot/dts/imx51-apf51.dts +1 -0

index 79d8003..1eddf29 100644
@@ -22,6 +22,7 @@
 	compatible = "armadeus,imx51-apf51", "fsl,imx51";
 
 	memory at 90000000 {
+		device_type = "memory";
 		reg = <0x90000000 0x20000000>;
 	};

arch/arm/boot/dts/imx51-babbage.dts +1 -0

index 35ee1b4..ed6a3ce 100644
@@ -15,6 +15,7 @@
 	};
 
 	memory at 90000000 {
+		device_type = "memory";
 		reg = <0x90000000 0x20000000>;
 	};

arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi +1 -0

index 5761a66..82d8df0 100644
@@ -17,6 +17,7 @@
 	compatible = "digi,connectcore-ccxmx51-som", "fsl,imx51";
 
 	memory at 90000000 {
+		device_type = "memory";
 		reg = <0x90000000 0x08000000>;
 	};
 };

arch/arm/boot/dts/imx51-eukrea-cpuimx51.dtsi +1 -0

index f8902a3..2e31253 100644
@@ -23,6 +23,7 @@
 	compatible = "eukrea,cpuimx51", "fsl,imx51";
 
 	memory at 90000000 {
+		device_type = "memory";
 		reg = <0x90000000 0x10000000>; /* 256M */
 	};
 };

arch/arm/boot/dts/imx51-ts4800.dts +1 -0

index 39eb067..4344632 100644
@@ -18,6 +18,7 @@
 	};
 
 	memory at 90000000 {
+		device_type = "memory";
 		reg = <0x90000000 0x10000000>;
 	};

arch/arm/boot/dts/imx51-zii-rdu1.dts +1 -0

index e45a15c..3ca4f9b 100644
@@ -53,6 +53,7 @@
 
 	/* Will be filled by the bootloader */
 	memory at 90000000 {
+		device_type = "memory";
 		reg = <0x90000000 0>;
 	};

arch/arm/boot/dts/imx51-zii-scu2-mezz.dts +1 -0

index 243d1c8..aa91e5d 100644
@@ -18,6 +18,7 @@
 
 	/* Will be filled by the bootloader */
 	memory at 90000000 {
+		device_type = "memory";
 		reg = <0x90000000 0>;
 	};

arch/arm/boot/dts/imx51-zii-scu3-esb.dts +1 -0

index 14b2077..875b10a 100644
@@ -18,6 +18,7 @@
 
 	/* Will be filled by the bootloader */
 	memory at 90000000 {
+		device_type = "memory";
 		reg = <0x90000000 0>;
 	};

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

index 67d4627..7651bed 100644
@@ -16,10 +16,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 = &fec;

Signature · 1 line

2.7.4

Fabio Estevam

author reviewer

2018-11-05 21:14 UTC #1 lore raw

PATCH v2 2/2 ARM: dts: imx53: Fix memory node duplicaton

Boards based on imx53 have duplicate memory nodes:

- One coming from the board dts file: memory@

- One coming from the imx53.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]>

---
Changes since v1:
- Also change imx53-ard.dts

 arch/arm/boot/dts/imx53-ard.dts         | 1 +
 arch/arm/boot/dts/imx53-cx9020.dts      | 1 +
 arch/arm/boot/dts/imx53-m53.dtsi        | 1 +
 arch/arm/boot/dts/imx53-qsb-common.dtsi | 1 +
 arch/arm/boot/dts/imx53-smd.dts         | 1 +
 arch/arm/boot/dts/imx53-tqma53.dtsi     | 1 +
 arch/arm/boot/dts/imx53-tx53.dtsi       | 1 +
 arch/arm/boot/dts/imx53-usbarmory.dts   | 1 +
 arch/arm/boot/dts/imx53.dtsi            | 2 --
 9 files changed, 8 insertions(+), 2 deletions(-)

arch/arm/boot/dts/imx53-ard.dts +1 -0

index 117bd00..7d5a482 100644
@@ -19,6 +19,7 @@
 	compatible = "fsl,imx53-ard", "fsl,imx53";
 
 	memory at 70000000 {
+		device_type = "memory";
 		reg = <0x70000000 0x40000000>;
 	};

arch/arm/boot/dts/imx53-cx9020.dts +1 -0

index cf70ebc..c875e23 100644
@@ -22,6 +22,7 @@
 	};
 
 	memory at 70000000 {
+		device_type = "memory";
 		reg = <0x70000000 0x20000000>,
 		      <0xb0000000 0x20000000>;
 	};

arch/arm/boot/dts/imx53-m53.dtsi +1 -0

index ce45f08..db2e5bc 100644
@@ -16,6 +16,7 @@
 	compatible = "aries,imx53-m53", "denx,imx53-m53", "fsl,imx53";
 
 	memory at 70000000 {
+		device_type = "memory";
 		reg = <0x70000000 0x20000000>,
 		      <0xb0000000 0x20000000>;
 	};

arch/arm/boot/dts/imx53-qsb-common.dtsi +1 -0

index 50dde84..f00dda3 100644
@@ -11,6 +11,7 @@
 	};
 
 	memory at 70000000 {
+		device_type = "memory";
 		reg = <0x70000000 0x20000000>,
 		      <0xb0000000 0x20000000>;
 	};

arch/arm/boot/dts/imx53-smd.dts +1 -0

index 462071c..09071ca 100644
@@ -12,6 +12,7 @@
 	compatible = "fsl,imx53-smd", "fsl,imx53";
 
 	memory at 70000000 {
+		device_type = "memory";
 		reg = <0x70000000 0x40000000>;
 	};

arch/arm/boot/dts/imx53-tqma53.dtsi +1 -0

index a72b898..c77d58f 100644
@@ -17,6 +17,7 @@
 	compatible = "tq,tqma53", "fsl,imx53";
 
 	memory at 70000000 {
+		device_type = "memory";
 		reg = <0x70000000 0x40000000>; /* Up to 1GiB */
 	};

arch/arm/boot/dts/imx53-tx53.dtsi +1 -0

index 54cf3e6..4ab1359 100644
@@ -51,6 +51,7 @@
 
 	/* Will be filled by the bootloader */
 	memory at 70000000 {
+		device_type = "memory";
 		reg = <0x70000000 0>;
 	};

arch/arm/boot/dts/imx53-usbarmory.dts +1 -0

index f6268d0..ee6263d 100644
@@ -58,6 +58,7 @@
 	};
 
 	memory at 70000000 {
+		device_type = "memory";
 		reg = <0x70000000 0x20000000>;
 	};

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

index 207eb55..930e2e1 100644
@@ -23,10 +23,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 = &fec;

Signature · 1 line

2.7.4

Shawn Guo

Applied

2018-11-16 05:19 UTC #2 lore raw

PATCH v2 1/2 ARM: dts: imx51: Fix memory node duplicaton

In reply to Fabio Estevam

Quoted 11 lines · Fabio Estevam

Boards based on imx51 have duplicate memory nodes:
- One coming from the board dts file: memory@
- One coming from the imx51.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 both, thanks.