ARM: dts: vf: Fix memory node duplication

PATCH Applied Fabio Estevam 3 participants 3 messages Dec 1, 2018 – Dec 5, 2018 Device tree bindings

lore

Share & tools

lore

Fabio Estevam

author

2018-12-01 00:44 UTC #0 lore raw

PATCH 1/1 ARM: dts: vf: Fix memory node duplication

Boards based on vf500/vf600 have duplicate memory nodes:

- One coming from the board dts file: memory@

- One coming from the vf500.dtsi/vf610m4.dtsi files.

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/vf500-colibri.dtsi      | 1 +
 arch/arm/boot/dts/vf500.dtsi              | 1 -
 arch/arm/boot/dts/vf610-bk4.dts           | 1 +
 arch/arm/boot/dts/vf610-colibri.dtsi      | 1 +
 arch/arm/boot/dts/vf610-cosmic.dts        | 1 +
 arch/arm/boot/dts/vf610-twr.dts           | 1 +
 arch/arm/boot/dts/vf610-zii-cfu1.dts      | 1 +
 arch/arm/boot/dts/vf610-zii-dev.dtsi      | 1 +
 arch/arm/boot/dts/vf610-zii-ssmb-spu3.dts | 1 +
 arch/arm/boot/dts/vf610m4-colibri.dts     | 1 +
 arch/arm/boot/dts/vf610m4.dtsi            | 1 -
 11 files changed, 9 insertions(+), 2 deletions(-)

arch/arm/boot/dts/vf500-colibri.dtsi +1 -0

index 2e7e3ce..237b024 100644
@@ -47,6 +47,7 @@
 	compatible = "toradex,vf610-colibri_vf50", "fsl,vf500";
 
 	memory@80000000 {
+		device_type = "memory";
 		reg = <0x80000000 0x8000000>;
 	};

arch/arm/boot/dts/vf500.dtsi +0 -1

index 76a0949..b0ec475 100644
@@ -10,7 +10,6 @@
 	#size-cells = <1>;
 	chosen { };
 	aliases { };
-	memory { device_type = "memory"; };
 
 	cpus {
 		#address-cells = <1>;

arch/arm/boot/dts/vf610-bk4.dts +1 -0

index cab9571..689c893 100644
@@ -16,6 +16,7 @@
 	};
 
 	memory@80000000 {
+		device_type = "memory";
 		reg = <0x80000000 0x8000000>;
 	};

arch/arm/boot/dts/vf610-colibri.dtsi +1 -0

index aeaf99f..05c9a39 100644
@@ -47,6 +47,7 @@
 	compatible = "toradex,vf610-colibri_vf61", "fsl,vf610";
 
 	memory@80000000 {
+		device_type = "memory";
 		reg = <0x80000000 0x10000000>;
 	};
 };

arch/arm/boot/dts/vf610-cosmic.dts +1 -0

index a3014e8..ea1b996 100644
@@ -20,6 +20,7 @@
 	};
 
 	memory@80000000 {
+		device_type = "memory";
 		reg = <0x80000000 0x10000000>;
 	};

arch/arm/boot/dts/vf610-twr.dts +1 -0

index 59fceea..dbb5ffc 100644
@@ -14,6 +14,7 @@
 	};
 
 	memory@80000000 {
+		device_type = "memory";
 		reg = <0x80000000 0x8000000>;
 	};

arch/arm/boot/dts/vf610-zii-cfu1.dts +1 -0

index b76c3d04..7cdcc5f 100644
@@ -16,6 +16,7 @@
 	};
 
 	memory@80000000 {
+		device_type = "memory";
 		reg = <0x80000000 0x20000000>;
 	};

arch/arm/boot/dts/vf610-zii-dev.dtsi +1 -0

index 5ae5abf..19eb4a8 100644
@@ -50,6 +50,7 @@
 	};
 
 	memory@80000000 {
+		device_type = "memory";
 		reg = <0x80000000 0x20000000>;
 	};

arch/arm/boot/dts/vf610-zii-ssmb-spu3.dts +1 -0

index fe35766..757af56 100644
@@ -24,6 +24,7 @@
 	};
 
 	memory@80000000 {
+		device_type = "memory";
 		reg = <0x80000000 0x20000000>;
 	};

arch/arm/boot/dts/vf610m4-colibri.dts +1 -0

index ca62495..d4bc0e3 100644
@@ -55,6 +55,7 @@
 	};
 
 	memory@8c000000 {
+		device_type = "memory";
 		reg = <0x8c000000 0x3000000>;
 	};
 };

arch/arm/boot/dts/vf610m4.dtsi +0 -1

index 8293276..76bbfd5 100644
@@ -50,7 +50,6 @@
 	#size-cells = <1>;
 	chosen { };
 	aliases { };
-	memory { device_type = "memory"; };
 };
 
 &mscm_ir {

Signature · 1 line

2.7.4

Stefan Agner

Reviewed-by on v1 1/1

2018-12-03 13:40 UTC #1 lore raw

Quoted 8 lines · Fabio Estevam

Boards based on vf500/vf600 have duplicate memory nodes:
- One coming from the board dts file: memory@
- One coming from the vf500.dtsi/vf610m4.dtsi files.
Fix the duplication by removing the memory node from the dtsi file and by adding 'device_type = "memory";' in the board dts.

Looks good to me:

Reviewed-by Stefan Agner <[email protected]>

Quoted 156 lines

Reported-by Rob Herring <[email protected]>

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

---
 arch/arm/boot/dts/vf500-colibri.dtsi      | 1 +
 arch/arm/boot/dts/vf500.dtsi              | 1 -
 arch/arm/boot/dts/vf610-bk4.dts           | 1 +
 arch/arm/boot/dts/vf610-colibri.dtsi      | 1 +
 arch/arm/boot/dts/vf610-cosmic.dts        | 1 +
 arch/arm/boot/dts/vf610-twr.dts           | 1 +
 arch/arm/boot/dts/vf610-zii-cfu1.dts      | 1 +
 arch/arm/boot/dts/vf610-zii-dev.dtsi      | 1 +
 arch/arm/boot/dts/vf610-zii-ssmb-spu3.dts | 1 +
 arch/arm/boot/dts/vf610m4-colibri.dts     | 1 +
 arch/arm/boot/dts/vf610m4.dtsi            | 1 -
 11 files changed, 9 insertions(+), 2 deletions(-)

arch/arm/boot/dts/vf500-colibri.dtsi +1 -0

index 2e7e3ce..237b024 100644
@@ -47,6 +47,7 @@
 	compatible = "toradex,vf610-colibri_vf50", "fsl,vf500";
 
 	memory@80000000 {
+		device_type = "memory";
 		reg = <0x80000000 0x8000000>;
 	};

arch/arm/boot/dts/vf500.dtsi +0 -1

index 76a0949..b0ec475 100644
@@ -10,7 +10,6 @@
 	#size-cells = <1>;
 	chosen { };
 	aliases { };
-	memory { device_type = "memory"; };
 
 	cpus {
 		#address-cells = <1>;

arch/arm/boot/dts/vf610-bk4.dts +1 -0

index cab9571..689c893 100644
@@ -16,6 +16,7 @@
 	};
 
 	memory@80000000 {
+		device_type = "memory";
 		reg = <0x80000000 0x8000000>;
 	};

arch/arm/boot/dts/vf610-colibri.dtsi +1 -0

index aeaf99f..05c9a39 100644
@@ -47,6 +47,7 @@
 	compatible = "toradex,vf610-colibri_vf61", "fsl,vf610";
 
 	memory@80000000 {
+		device_type = "memory";
 		reg = <0x80000000 0x10000000>;
 	};
 };

arch/arm/boot/dts/vf610-cosmic.dts +1 -0

index a3014e8..ea1b996 100644
@@ -20,6 +20,7 @@
 	};
 
 	memory@80000000 {
+		device_type = "memory";
 		reg = <0x80000000 0x10000000>;
 	};

arch/arm/boot/dts/vf610-twr.dts +1 -0

index 59fceea..dbb5ffc 100644
@@ -14,6 +14,7 @@
 	};
 
 	memory@80000000 {
+		device_type = "memory";
 		reg = <0x80000000 0x8000000>;
 	};

arch/arm/boot/dts/vf610-zii-cfu1.dts +1 -0

index b76c3d04..7cdcc5f 100644
@@ -16,6 +16,7 @@
 	};
 
 	memory@80000000 {
+		device_type = "memory";
 		reg = <0x80000000 0x20000000>;
 	};

arch/arm/boot/dts/vf610-zii-dev.dtsi +1 -0

index 5ae5abf..19eb4a8 100644
@@ -50,6 +50,7 @@
 	};
 
 	memory@80000000 {
+		device_type = "memory";
 		reg = <0x80000000 0x20000000>;
 	};

arch/arm/boot/dts/vf610-zii-ssmb-spu3.dts +1 -0

index fe35766..757af56 100644
@@ -24,6 +24,7 @@
 	};
 
 	memory@80000000 {
+		device_type = "memory";
 		reg = <0x80000000 0x20000000>;
 	};

arch/arm/boot/dts/vf610m4-colibri.dts +1 -0

index ca62495..d4bc0e3 100644
@@ -55,6 +55,7 @@
 	};
 
 	memory@8c000000 {
+		device_type = "memory";
 		reg = <0x8c000000 0x3000000>;
 	};
 };

arch/arm/boot/dts/vf610m4.dtsi +0 -1

index 8293276..76bbfd5 100644
@@ -50,7 +50,6 @@
 	#size-cells = <1>;
 	chosen { };
 	aliases { };
-	memory { device_type = "memory"; };
 };
 
 &mscm_ir {

Shawn Guo

Applied

2018-12-05 07:54 UTC #2 lore raw

In reply to Fabio Estevam

Quoted 10 lines · Fabio Estevam

Boards based on vf500/vf600 have duplicate memory nodes:
- One coming from the board dts file: memory@
- One coming from the vf500.dtsi/vf610m4.dtsi files.
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]>

Applied, thanks.