Skip to contentSkip to conversation

ARM: dts: vf500: Remove skeleton.dtsi inclusion

PATCH New Fabio Estevam 2 participants 6 messages Mar 3, 2018 – Mar 8, 2018 Device tree bindings

lore
Share & tools
lore

Fabio Estevam

author
#0 lore raw

PATCH v2 1/5 ARM: dts: vf500: Remove skeleton.dtsi inclusion

From: Fabio Estevam <[email protected]>

Since commit 9c0da3cc61f1 ("ARM: dts: explicitly mark skeleton.dtsi as deprecated") the inclusion of skeleton.dtsi is deprecated, so remove it as this file will eventually go away someday.

Move its content to the SoC dtsi file, so that the resultant dtb is the same.

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

---
Changes since v1:
- None

 arch/arm/boot/dts/vf500.dtsi | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
arch/arm/boot/dts/vf500.dtsi +6 -1
index 348bcd3..1e3b479 100644
@@ -39,11 +39,16 @@
  *     OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "skeleton.dtsi"
 #include "vfxxx.dtsi"
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 
 / {
+	#address-cells = <1>;
+	#size-cells = <1>;
+	chosen { };
+	aliases { };
+	memory { device_type = "memory"; reg = <0 0>; };
+
 	cpus {
 		#address-cells = <1>;
 		#size-cells = <0>;
Signature · 1 line
2.7.4
author
#1 lore raw

PATCH v2 2/5 ARM: dts: vf: Add memory node unit name

From: Fabio Estevam <[email protected]>

Include memory node unit name in order to fix the following W=1 warnings:

Warning (unit_address_vs_reg): Node /memory has a reg or ranges property, but no unit name

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

---
Changes since v1:
- None

 arch/arm/boot/dts/vf500-colibri.dtsi  | 2 +-
 arch/arm/boot/dts/vf610-colibri.dtsi  | 2 +-
 arch/arm/boot/dts/vf610-cosmic.dts    | 2 +-
 arch/arm/boot/dts/vf610-twr.dts       | 2 +-
 arch/arm/boot/dts/vf610-zii-dev.dtsi  | 2 +-
 arch/arm/boot/dts/vf610m4-colibri.dts | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)
arch/arm/boot/dts/vf500-colibri.dtsi +1 -1
index 515c4d2f..2e7e3ce 100644
@@ -46,7 +46,7 @@
 	model = "Toradex Colibri VF50 COM";
 	compatible = "toradex,vf610-colibri_vf50", "fsl,vf500";
 
-	memory {
+	memory at 80000000 {
 		reg = <0x80000000 0x8000000>;
 	};
arch/arm/boot/dts/vf610-colibri.dtsi +1 -1
index 395812c..aeaf99f 100644
@@ -46,7 +46,7 @@
 	model = "Toradex Colibri VF61 COM";
 	compatible = "toradex,vf610-colibri_vf61", "fsl,vf610";
 
-	memory {
+	memory at 80000000 {
 		reg = <0x80000000 0x10000000>;
 	};
 };
arch/arm/boot/dts/vf610-cosmic.dts +1 -1
index 5447f25..a3014e8 100644
@@ -19,7 +19,7 @@
 		bootargs = "console=ttyLP1,115200";
 	};
 
-	memory {
+	memory at 80000000 {
 		reg = <0x80000000 0x10000000>;
 	};
arch/arm/boot/dts/vf610-twr.dts +1 -1
index 6f787e67..6be7a82 100644
@@ -50,7 +50,7 @@
 		bootargs = "console=ttyLP1,115200";
 	};
 
-	memory {
+	memory at 80000000 {
 		reg = <0x80000000 0x8000000>;
 	};
arch/arm/boot/dts/vf610-zii-dev.dtsi +1 -1
index aadd36d..4890b8a 100644
@@ -49,7 +49,7 @@
 		stdout-path = "serial0:115200n8";
 	};
 
-	memory {
+	memory at 80000000 {
 		reg = <0x80000000 0x20000000>;
 	};
arch/arm/boot/dts/vf610m4-colibri.dts +1 -1
index 7198e8c..2b237ef 100644
@@ -54,7 +54,7 @@
 		linux,stdout-path = "&uart2";
 	};
 
-	memory {
+	memory at 8c000000 {
 		reg = <0x8c000000 0x3000000>;
 	};
 };
Signature · 1 line
2.7.4
author
#2 lore raw

PATCH v2 3/5 ARM: dts: vf500: Remove the zero length reg property

In reply to Fabio Estevam

From: Fabio Estevam <[email protected]>

All the vf500 based boards include the real memory size in their dts files, so remove the zero length reg property.

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

---
Changes since v1:
- Improve the wording to "zero length reg property" (Stefan Agner)

 arch/arm/boot/dts/vf500.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/vf500.dtsi +1 -1
index 1e3b479..bbff011 100644
@@ -47,7 +47,7 @@
 	#size-cells = <1>;
 	chosen { };
 	aliases { };
-	memory { device_type = "memory"; reg = <0 0>; };
+	memory { device_type = "memory"; };
 
 	cpus {
 		#address-cells = <1>;
Signature · 1 line
2.7.4
author
#3 lore raw

PATCH v2 4/5 ARM: dts: vf610m4: Remove skeleton.dtsi inclusion

In reply to Fabio Estevam

From: Fabio Estevam <[email protected]>

Since commit 9c0da3cc61f1 ("ARM: dts: explicitly mark skeleton.dtsi as deprecated") the inclusion of skeleton.dtsi is deprecated, so remove it as this file will eventually go away someday.

Move its content to the SoC dtsi file, so that the resultant dtb is the same.

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

---
Changes since v1:
- None

 arch/arm/boot/dts/vf610m4.dtsi | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
arch/arm/boot/dts/vf610m4.dtsi +8 -1
index 1474bd3..5d52af2 100644
@@ -42,10 +42,17 @@
  *     OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "skeleton.dtsi"
 #include "armv7-m.dtsi"
 #include "vfxxx.dtsi"
 
+/ {
+	#address-cells = <1>;
+	#size-cells = <1>;
+	chosen { };
+	aliases { };
+	memory { device_type = "memory"; reg = <0 0>; };
+};
+
 &mscm_ir {
 	interrupt-parent = <&nvic>;
 };
Signature · 1 line
2.7.4
author
#4 lore raw

PATCH v2 5/5 ARM: dts: vf610m4: Remove the zero length reg property

In reply to Fabio Estevam

From: Fabio Estevam <[email protected]>

All the vf610m4 based boards include the real memory size in their dts files, so remove the the zero length reg property.

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

---
Changes since v1:
- Improve the wording to "zero length reg property" (Stefan Agner)

 arch/arm/boot/dts/vf610m4.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/vf610m4.dtsi +1 -1
index 5d52af2..8293276 100644
@@ -50,7 +50,7 @@
 	#size-cells = <1>;
 	chosen { };
 	aliases { };
-	memory { device_type = "memory"; reg = <0 0>; };
+	memory { device_type = "memory"; };
 };
 
 &mscm_ir {
Signature · 1 line
2.7.4
Applied
#5 lore raw

PATCH v2 1/5 ARM: dts: vf500: Remove skeleton.dtsi inclusion

In reply to Fabio Estevam
Quoted 11 lines · Fabio Estevam

From: Fabio Estevam <[email protected]>

Since commit 9c0da3cc61f1 ("ARM: dts: explicitly mark skeleton.dtsi as deprecated") the inclusion of skeleton.dtsi is deprecated, so remove it as this file will eventually go away someday.

Move its content to the SoC dtsi file, so that the resultant dtb is the same.

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

Applied all, thanks.