Skip to contentSkip to conversation

ARM: dts: imx1: Fix memory node duplicaton

PATCH New Fabio Estevam 3 participants 5 messages Nov 26, 2018 – Nov 28, 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: imx1: Fix memory node duplicaton

Boards based on imx1 have duplicate memory nodes:

- One coming from the board dts file: memory@

- One coming from the imx1.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/imx1-ads.dts     | 1 +
 arch/arm/boot/dts/imx1-apf9328.dts | 1 +
 arch/arm/boot/dts/imx1.dtsi        | 2 --
 3 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/imx1-ads.dts +1 -0
index a1d81ba..3459a58 100644
@@ -21,6 +21,7 @@
 	};
 
 	memory at 8000000 {
+		 device_type = "memory";
 		reg = <0x08000000 0x04000000>;
 	};
 };
arch/arm/boot/dts/imx1-apf9328.dts +1 -0
index 11515c0..ee4b1b1 100644
@@ -21,6 +21,7 @@
 	};
 
 	memory at 8000000 {
+		device_type = "memory";
 		reg = <0x08000000 0x00800000>;
 	};
 };
arch/arm/boot/dts/imx1.dtsi +0 -2
index b00ece1..b30448c 100644
@@ -15,10 +15,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: imx27: Fix memory node duplicaton

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 <[email protected]>
Signed-off-by Fabio Estevam <[email protected]>
---
 arch/arm/boot/dts/imx27-apf27.dts                 | 1 +
 arch/arm/boot/dts/imx27-eukrea-cpuimx27.dtsi      | 1 +
 arch/arm/boot/dts/imx27-pdk.dts                   | 1 +
 arch/arm/boot/dts/imx27-phytec-phycard-s-som.dtsi | 1 +
 arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi   | 1 +
 arch/arm/boot/dts/imx27.dtsi                      | 2 --
 6 files changed, 5 insertions(+), 2 deletions(-)
arch/arm/boot/dts/imx27-apf27.dts +1 -0
index 3eddd80..f635d5c 100644
@@ -20,6 +20,7 @@
 	compatible = "armadeus,imx27-apf27", "fsl,imx27";
 
 	memory at a0000000 {
+		device_type = "memory";
 		reg = <0xa0000000 0x04000000>;
 	};
 };
arch/arm/boot/dts/imx27-eukrea-cpuimx27.dtsi +1 -0
index 9c455dc..c85f9d0 100644
@@ -17,6 +17,7 @@
 	compatible = "eukrea,cpuimx27", "fsl,imx27";
 
 	memory at a0000000 {
+		device_type = "memory";
 		reg = <0xa0000000 0x04000000>;
 	};
arch/arm/boot/dts/imx27-pdk.dts +1 -0
index f9a882d..35123b7 100644
@@ -10,6 +10,7 @@
 	compatible = "fsl,imx27-pdk", "fsl,imx27";
 
 	memory at a0000000 {
+		device_type = "memory";
 		reg = <0xa0000000 0x08000000>;
 	};
arch/arm/boot/dts/imx27-phytec-phycard-s-som.dtsi +1 -0
index cbad7c8..b0b4f7c 100644
@@ -18,6 +18,7 @@
 	compatible = "phytec,imx27-pca100", "fsl,imx27";
 
 	memory at a0000000 {
+		device_type = "memory";
 		reg = <0xa0000000 0x08000000>; /* 128MB */
 	};
 };
arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi +1 -0
index ec466b4..0935e14 100644
@@ -17,6 +17,7 @@
 	compatible = "phytec,imx27-pcm038", "fsl,imx27";
 
 	memory at a0000000 {
+		device_type = "memory";
 		reg = <0xa0000000 0x08000000>;
 	};
arch/arm/boot/dts/imx27.dtsi +0 -2
index 151b0eb..26ff5d4 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
author reviewer
#2 lore raw

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

In reply to Fabio Estevam

Boards based on imx25 have duplicate memory nodes:

- One coming from the board dts file: memory@

- One coming from the imx25.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/imx25-eukrea-cpuimx25.dtsi | 1 +
 arch/arm/boot/dts/imx25-karo-tx25.dts        | 1 +
 arch/arm/boot/dts/imx25-pdk.dts              | 1 +
 arch/arm/boot/dts/imx25.dtsi                 | 2 --
 4 files changed, 3 insertions(+), 2 deletions(-)
arch/arm/boot/dts/imx25-eukrea-cpuimx25.dtsi +1 -0
index e316fe0..e4d7da2 100644
@@ -18,6 +18,7 @@
 	compatible = "eukrea,cpuimx25", "fsl,imx25";
 
 	memory at 80000000 {
+		device_type = "memory";
 		reg = <0x80000000 0x4000000>; /* 64M */
 	};
 };
arch/arm/boot/dts/imx25-karo-tx25.dts +1 -0
index 5cb6967..f37e9a7 100644
@@ -37,6 +37,7 @@
 	};
 
 	memory at 80000000 {
+		device_type = "memory";
 		reg = <0x80000000 0x02000000 0x90000000 0x02000000>;
 	};
 };
arch/arm/boot/dts/imx25-pdk.dts +1 -0
index a5626b4..f8544a9 100644
@@ -12,6 +12,7 @@
 	compatible = "fsl,imx25-pdk", "fsl,imx25";
 
 	memory at 80000000 {
+		device_type = "memory";
 		reg = <0x80000000 0x4000000>;
 	};
arch/arm/boot/dts/imx25.dtsi +0 -2
index e801018..9a097ef 100644
@@ -12,10 +12,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
#3 lore raw

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

In reply to Fabio Estevam

Hi Fabio,

Quoted 22 lines · Fabio Estevam

Boards based on imx1 have duplicate memory nodes:

- One coming from the board dts file: memory@

- One coming from the imx1.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/imx1-ads.dts     | 1 +
 arch/arm/boot/dts/imx1-apf9328.dts | 1 +
 arch/arm/boot/dts/imx1.dtsi        | 2 --
 3 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/imx1-ads.dts +0 -0
index a1d81ba..3459a58 100644

arch/arm/boot/dts/imx1-ads.dts line 25

Quoted 5 lines
arch/arm/boot/dts/imx1-ads.dts +1 -0
@@ -21,6 +21,7 @@
 	};
 
 	memory at 8000000 {
+		 device_type = "memory";
 		reg = <0x08000000 0x04000000>;

there is an unwanted space symbol before 'device_type'.

--
Best wishes,
Vladimir

#4 lore raw

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

Quoted 27 lines · Vladimir Zapolskiy

Hi Fabio,

Quoted 24 lines · Fabio Estevam

Boards based on imx1 have duplicate memory nodes:

- One coming from the board dts file: memory@

- One coming from the imx1.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/imx1-ads.dts     | 1 +
 arch/arm/boot/dts/imx1-apf9328.dts | 1 +
 arch/arm/boot/dts/imx1.dtsi        | 2 --
 3 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/imx1-ads.dts +0 -0
index a1d81ba..3459a58 100644
@@ -21,6 +21,7 @@
 	};
Quoted 5 lines

arch/arm/boot/dts/imx1-ads.dts line 25

Quoted 3 lines
arch/arm/boot/dts/imx1-ads.dts +1 -0
 	memory at 8000000 {
+		 device_type = "memory";
 		reg = <0x08000000 0x04000000>;

there is an unwanted space symbol before 'device_type'.

I fixed it up and applied the series.

Shawn