Skip to contentSkip to conversation

ARM: dts: imx31: Fix memory node duplicaton

PATCH New Fabio Estevam 3 participants 5 messages Nov 6, 2018 – Nov 16, 2018

Subsystems (2)
Device tree bindings Arm i.MX and Layerscape
lore
Share & tools
lore

Fabio Estevam

author reviewer
#0 lore raw

PATCH 1/3 ARM: dts: imx31: Fix memory node duplicaton

Boards based on imx31 have duplicate memory nodes:

- One coming from the board dts file: memory@

- One coming from the imx31.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/imx31-bug.dts  | 1 +
 arch/arm/boot/dts/imx31-lite.dts | 1 +
 arch/arm/boot/dts/imx31.dtsi     | 2 --
 3 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/imx31-bug.dts +1 -0
index 6ee4ff8..9eb960c 100644
@@ -17,6 +17,7 @@
 	compatible = "buglabs,imx31-bug", "fsl,imx31";
 
 	memory at 80000000 {
+		device_type = "memory";
 		reg = <0x80000000 0x8000000>; /* 128M */
 	};
 };
arch/arm/boot/dts/imx31-lite.dts +1 -0
index db52ddc..d17abdf 100644
@@ -18,6 +18,7 @@
 	};
 
 	memory at 80000000 {
+		device_type = "memory";
 		reg = <0x80000000 0x8000000>;
 	};
arch/arm/boot/dts/imx31.dtsi +0 -2
index af7afcc..d7f6fb7 100644
@@ -10,10 +10,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 = &gpio1;
Signature · 1 line
2.7.4
author reviewer
#1 lore raw

PATCH 2/3 ARM: dts: imx35: Fix memory node duplicaton

Boards based on imx35 have duplicate memory nodes:

- One coming from the board dts file: memory@

- One coming from the imx35.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/imx35-eukrea-cpuimx35.dtsi | 1 +
 arch/arm/boot/dts/imx35-pdk.dts              | 1 +
 arch/arm/boot/dts/imx35.dtsi                 | 2 --
 3 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/imx35-eukrea-cpuimx35.dtsi +1 -0
index ba39d93..5f8a47a 100644
@@ -18,6 +18,7 @@
 	compatible = "eukrea,cpuimx35", "fsl,imx35";
 
 	memory at 80000000 {
+		device_type = "memory";
 		reg = <0x80000000 0x8000000>; /* 128M */
 	};
 };
arch/arm/boot/dts/imx35-pdk.dts +1 -0
index df613e8..ddce0a8 100644
@@ -11,6 +11,7 @@
 	compatible = "fsl,imx35-pdk", "fsl,imx35";
 
 	memory at 80000000 {
+		device_type = "memory";
 		reg = <0x80000000 0x8000000>,
 		      <0x90000000 0x8000000>;
 	};
arch/arm/boot/dts/imx35.dtsi +0 -2
index a1c3d28..59cadee 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 {
 		ethernet0 = &fec;
Signature · 1 line
2.7.4
author reviewer
#2 lore raw

PATCH 3/3 ARM: dts: imx7: Fix memory node duplicaton

In reply to Fabio Estevam

Boards based on imx7 have duplicate memory nodes:

- One coming from the board dts file: memory@

- One coming from the imx7s.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/imx7d-cl-som-imx7.dts   | 3 ++-
 arch/arm/boot/dts/imx7d-colibri-emmc.dtsi | 1 +
 arch/arm/boot/dts/imx7d-colibri.dtsi      | 1 +
 arch/arm/boot/dts/imx7d-nitrogen7.dts     | 1 +
 arch/arm/boot/dts/imx7d-pico.dtsi         | 1 +
 arch/arm/boot/dts/imx7d-sdb.dts           | 1 +
 arch/arm/boot/dts/imx7s-colibri.dtsi      | 1 +
 arch/arm/boot/dts/imx7s-warp.dts          | 1 +
 arch/arm/boot/dts/imx7s.dtsi              | 2 --
 9 files changed, 9 insertions(+), 3 deletions(-)
arch/arm/boot/dts/imx7d-cl-som-imx7.dts +2 -1
index 8bf365d..e615674 100644
@@ -19,6 +19,7 @@
 	compatible = "compulab,cl-som-imx7", "fsl,imx7d";
 
 	memory at 80000000 {
+		device_type = "memory";
 		reg = <0x80000000 0x10000000>; /* 256 MB - minimal configuration */
 	};
 

@@ -284,4 +285,4 @@
 			MX7D_PAD_LPSR_GPIO1_IO05__GPIO1_IO5	0x14 /* OTG PWREN */
 		>;
 	};
-};
\ No newline at end of file
+};
arch/arm/boot/dts/imx7d-colibri-emmc.dtsi +1 -0
index 04d24ee..898f4b8 100644
@@ -8,6 +8,7 @@
 
 / {
 	memory at 80000000 {
+		device_type = "memory";
 		reg = <0x80000000 0x40000000>;
 	};
 };
arch/arm/boot/dts/imx7d-colibri.dtsi +1 -0
index d9f8fb6..e2e327f 100644
@@ -45,6 +45,7 @@
 
 / {
 	memory at 80000000 {
+		device_type = "memory";
 		reg = <0x80000000 0x20000000>;
 	};
 };
arch/arm/boot/dts/imx7d-nitrogen7.dts +1 -0
index d8aac4a..4fb7e84 100644
@@ -12,6 +12,7 @@
 	compatible = "boundary,imx7d-nitrogen7", "fsl,imx7d";
 
 	memory at 80000000 {
+		device_type = "memory";
 		reg = <0x80000000 0x40000000>;
 	};
arch/arm/boot/dts/imx7d-pico.dtsi +1 -0
index 21973eb..4846df0 100644
@@ -49,6 +49,7 @@
 	compatible = "technexion,imx7d-pico", "fsl,imx7d";
 
 	memory at 80000000 {
+		device_type = "memory";
 		reg = <0x80000000 0x80000000>;
 	};
arch/arm/boot/dts/imx7d-sdb.dts +1 -0
index f1bafda..b1b613b 100644
@@ -15,6 +15,7 @@
 	};
 
 	memory at 80000000 {
+		device_type = "memory";
 		reg = <0x80000000 0x80000000>;
 	};
arch/arm/boot/dts/imx7s-colibri.dtsi +1 -0
index fe8344c..1fb1ec5 100644
@@ -45,6 +45,7 @@
 
 / {
 	memory at 80000000 {
+		device_type = "memory";
 		reg = <0x80000000 0x10000000>;
 	};
 };
arch/arm/boot/dts/imx7s-warp.dts +1 -0
index f7ba2c0..23431fa 100644
@@ -14,6 +14,7 @@
 	compatible = "warp,imx7s-warp", "fsl,imx7s";
 
 	memory at 80000000 {
+		device_type = "memory";
 		reg = <0x80000000 0x20000000>;
 	};
arch/arm/boot/dts/imx7s.dtsi +0 -2
index aa8df7d..477901c 100644
@@ -17,10 +17,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 = &gpio1;
Signature · 1 line
2.7.4
#3 lore raw

PATCH 1/3 ARM: dts: imx31: Fix memory node duplicaton

In reply to Fabio Estevam

Hi Fabio,

Quoted 11 lines · Fabio Estevam

Boards based on imx31 have duplicate memory nodes:

- One coming from the board dts file: memory@

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

thank you for the change, I've successfully tested it on my i.MX31 Lite board.

Reviewed-by Vladimir Zapolskiy <[email protected]>
Tested-by Vladimir Zapolskiy <[email protected]>

--
Best wishes,
Vladimir

Applied
#4 lore raw

PATCH 1/3 ARM: dts: imx31: Fix memory node duplicaton

In reply to Fabio Estevam
Quoted 11 lines · Fabio Estevam

Boards based on imx31 have duplicate memory nodes:

- One coming from the board dts file: memory@

- One coming from the imx31.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 all, thanks.