Skip to contentSkip to conversation

ARM: dts: imx6ul-ccimx6ulsom: Add memory node to board dts

PATCH New Fabio Estevam 2 participants 5 messages Nov 20, 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/4 ARM: dts: imx6ul-ccimx6ulsom: Add memory node to board dts

Add memory node to board dts.

This is done in preparation of removing the memory node from imx6ul.dtsi.

Signed-off-by Fabio Estevam <[email protected]>
---
 arch/arm/boot/dts/imx6ul-ccimx6ulsom.dtsi | 5 +++++
 1 file changed, 5 insertions(+)
arch/arm/boot/dts/imx6ul-ccimx6ulsom.dtsi +5 -0
index c41ecee..b5781c3 100644
@@ -7,6 +7,11 @@
  */
 
 / {
+	memory at 80000000 {
+		device_type = "memory";
+		reg = <0x80000000 0>; /* will be filled by U-Boot */
+	};
+
 	reserved-memory {
 		#address-cells = <1>;
 		#size-cells = <1>;
Signature · 1 line
2.7.4
author reviewer
#1 lore raw

PATCH 2/4 ARM: dts: imx6ul: Fix memory node duplicaton

Boards based on imx6ul have duplicate memory nodes:

- One coming from the board dts file: memory@

- One coming from the imx6ul.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/imx6ul-14x14-evk.dtsi        | 1 +
 arch/arm/boot/dts/imx6ul-geam.dts              | 1 +
 arch/arm/boot/dts/imx6ul-isiot.dtsi            | 1 +
 arch/arm/boot/dts/imx6ul-litesom.dtsi          | 1 +
 arch/arm/boot/dts/imx6ul-opos6ul.dtsi          | 1 +
 arch/arm/boot/dts/imx6ul-pico-hobbit.dts       | 1 +
 arch/arm/boot/dts/imx6ul-tx6ul.dtsi            | 1 +
 arch/arm/boot/dts/imx6ul.dtsi                  | 2 --
 arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi | 1 +
 arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi    | 1 +
 10 files changed, 9 insertions(+), 2 deletions(-)
arch/arm/boot/dts/imx6ul-14x14-evk.dtsi +1 -0
index 32a0723..8180211 100644
@@ -12,6 +12,7 @@
 	};
 
 	memory at 80000000 {
+		device_type = "memory";
 		reg = <0x80000000 0x20000000>;
 	};
arch/arm/boot/dts/imx6ul-geam.dts +1 -0
index e22ec5b..bc77f26 100644
@@ -15,6 +15,7 @@
 	compatible = "engicam,imx6ul-geam", "fsl,imx6ul";
 
 	memory at 80000000 {
+		device_type = "memory";
 		reg = <0x80000000 0x08000000>;
 	};
arch/arm/boot/dts/imx6ul-isiot.dtsi +1 -0
index b1fa3f0..213e802 100644
@@ -10,6 +10,7 @@
 
 / {
 	memory at 80000000 {
+		device_type = "memory";
 		reg = <0x80000000 0x20000000>;
 	};
arch/arm/boot/dts/imx6ul-litesom.dtsi +1 -0
index 8f775f6..8d68932 100644
@@ -48,6 +48,7 @@
 	compatible = "grinn,imx6ul-litesom", "fsl,imx6ul";
 
 	memory at 80000000 {
+		device_type = "memory";
 		reg = <0x80000000 0x20000000>;
 	};
 };
arch/arm/boot/dts/imx6ul-opos6ul.dtsi +1 -0
index a031bee..cf7faf4 100644
@@ -49,6 +49,7 @@
 
 / {
 	memory at 80000000 {
+		device_type = "memory";
 		reg = <0x80000000 0>; /* will be filled by U-Boot */
 	};
arch/arm/boot/dts/imx6ul-pico-hobbit.dts +1 -0
index 0c09420f..797262d 100644
@@ -53,6 +53,7 @@
 
 	/* Will be filled by the bootloader */
 	memory at 80000000 {
+		device_type = "memory";
 		reg = <0x80000000 0>;
 	};
arch/arm/boot/dts/imx6ul-tx6ul.dtsi +1 -0
index 02b5ba4..bb6dbfd 100644
@@ -71,6 +71,7 @@
 	};
 
 	memory at 80000000 {
+		device_type = "memory";
 		reg = <0x80000000 0>; /* will be filled by U-Boot */
 	};
arch/arm/boot/dts/imx6ul.dtsi +0 -2
index c71d2d6..99c3663 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 {
 		ethernet0 = &fec1;
arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi +1 -0
index 10ab469..fb213be 100644
@@ -7,6 +7,7 @@
 
 / {
 	memory at 80000000 {
+		device_type = "memory";
 		reg = <0x80000000 0x10000000>;
 	};
 };
arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi +1 -0
index 183193e..038d8c90 100644
@@ -7,6 +7,7 @@
 
 / {
 	memory at 80000000 {
+		device_type = "memory";
 		reg = <0x80000000 0x20000000>;
 	};
Signature · 1 line
2.7.4
author reviewer
#2 lore raw

PATCH 3/4 ARM: dts: imx6sx: Fix memory node duplicaton

In reply to Fabio Estevam

Boards based on imx6sx have duplicate memory nodes:

- One coming from the board dts file: memory@

- One coming from the imx6sx.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/imx6sx-nitrogen6sx.dts         | 1 +
 arch/arm/boot/dts/imx6sx-sabreauto.dts           | 1 +
 arch/arm/boot/dts/imx6sx-sdb.dtsi                | 1 +
 arch/arm/boot/dts/imx6sx-softing-vining-2000.dts | 1 +
 arch/arm/boot/dts/imx6sx-udoo-neo-basic.dts      | 1 +
 arch/arm/boot/dts/imx6sx-udoo-neo-extended.dts   | 1 +
 arch/arm/boot/dts/imx6sx-udoo-neo-full.dts       | 1 +
 arch/arm/boot/dts/imx6sx.dtsi                    | 2 --
 8 files changed, 7 insertions(+), 2 deletions(-)
arch/arm/boot/dts/imx6sx-nitrogen6sx.dts +1 -0
index adb5cc7..832b5c5 100644
@@ -12,6 +12,7 @@
 	compatible = "boundary,imx6sx-nitrogen6sx", "fsl,imx6sx";
 
 	memory at 80000000 {
+		device_type = "memory";
 		reg = <0x80000000 0x40000000>;
 	};
arch/arm/boot/dts/imx6sx-sabreauto.dts +1 -0
index 841a27f..48aede5 100644
@@ -11,6 +11,7 @@
 	compatible = "fsl,imx6sx-sabreauto", "fsl,imx6sx";
 
 	memory at 80000000 {
+		device_type = "memory";
 		reg = <0x80000000 0x80000000>;
 	};
arch/arm/boot/dts/imx6sx-sdb.dtsi +1 -0
index 7d7d679..a6ec816 100644
@@ -21,6 +21,7 @@
 	};
 
 	memory at 80000000 {
+		device_type = "memory";
 		reg = <0x80000000 0x40000000>;
 	};
arch/arm/boot/dts/imx6sx-softing-vining-2000.dts +1 -0
index 252175b..2bc5162 100644
@@ -21,6 +21,7 @@
 	};
 
 	memory at 80000000 {
+		device_type = "memory";
 		reg = <0x80000000 0x40000000>;
 	};
arch/arm/boot/dts/imx6sx-udoo-neo-basic.dts +1 -0
index 40ccdf4..db0feb9 100644
@@ -49,6 +49,7 @@
 	compatible = "udoo,neobasic", "fsl,imx6sx";
 
 	memory at 80000000 {
+		device_type = "memory";
 		reg = <0x80000000 0x20000000>;
 	};
 };
arch/arm/boot/dts/imx6sx-udoo-neo-extended.dts +1 -0
index 42bfc8f..5c7a2bb 100644
@@ -49,6 +49,7 @@
 	compatible = "udoo,neoextended", "fsl,imx6sx";
 
 	memory at 80000000 {
+		device_type = "memory";
 		reg = <0x80000000 0x40000000>;
 	};
 };
arch/arm/boot/dts/imx6sx-udoo-neo-full.dts +1 -0
index c84c877..13dfe2a 100644
@@ -49,6 +49,7 @@
 	compatible = "udoo,neofull", "fsl,imx6sx";
 
 	memory at 80000000 {
+		device_type = "memory";
 		reg = <0x80000000 0x40000000>;
 	};
 };
arch/arm/boot/dts/imx6sx.dtsi +0 -2
index b79b6c4..2cdcf3e 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 {
 		can0 = &flexcan1;
Signature · 1 line
2.7.4
author reviewer
#3 lore raw

PATCH 4/4 ARM: dts: imx6sl: Fix memory node duplicaton

In reply to Fabio Estevam

Boards based on imx6sl have duplicate memory nodes:

- One coming from the board dts file: memory@

- One coming from the imx6sl.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/imx6sl-evk.dts  | 1 +
 arch/arm/boot/dts/imx6sl-warp.dts | 1 +
 arch/arm/boot/dts/imx6sl.dtsi     | 2 --
 arch/arm/boot/dts/imx6sll-evk.dts | 1 +
 4 files changed, 3 insertions(+), 2 deletions(-)
arch/arm/boot/dts/imx6sl-evk.dts +1 -0
index 679b448..f7a48e4 100644
@@ -17,6 +17,7 @@
 	};
 
 	memory at 80000000 {
+		device_type = "memory";
 		reg = <0x80000000 0x40000000>;
 	};
arch/arm/boot/dts/imx6sl-warp.dts +1 -0
index 404e602..408da70 100644
@@ -55,6 +55,7 @@
 	compatible = "warp,imx6sl-warp", "fsl,imx6sl";
 
 	memory at 80000000 {
+		device_type = "memory";
 		reg = <0x80000000 0x20000000>;
 	};
arch/arm/boot/dts/imx6sl.dtsi +0 -2
index 557d3fd..be66148 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;
arch/arm/boot/dts/imx6sll-evk.dts +1 -0
index c8e1155..0c2406a 100644
@@ -20,6 +20,7 @@
 	};
 
 	memory at 80000000 {
+		device_type = "memory";
 		reg = <0x80000000 0x80000000>;
 	};
Signature · 1 line
2.7.4