ARM: dts: imx1: Remove skeleton.dtsi

PATCH New Fabio Estevam 3 participants 12 messages Sep 6, 2016 – Nov 7, 2016

Subsystems (2)

Device tree bindings Arm i.MX and Layerscape

lore

Share & tools

lore

Fabio Estevam

author

2016-09-06 15:53 UTC #0 lore raw

PATCH 1/9 ARM: dts: imx1: Remove skeleton.dtsi

The inclusion of skeleton.dtsi causes the following build warning:

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

Instead of fixing skeleton.dtsi, just add the top level definitions for address-cells and size-cell and remove its inclusion.

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

---
 arch/arm/boot/dts/imx1.dtsi | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

arch/arm/boot/dts/imx1.dtsi +3 -1

index 22f5d1d..b792eee 100644
@@ -9,7 +9,6 @@
  * http://www.gnu.org/copyleft/gpl.html
  */
 
-#include "skeleton.dtsi"
 #include "imx1-pinfunc.h"
 
 #include <dt-bindings/clock/imx1-clock.h>

@@ -17,6 +16,9 @@
 #include <dt-bindings/interrupt-controller/irq.h>
 
 / {
+	#address-cells = <1>;
+	#size-cells = <1>;
+
 	aliases {
 		gpio0 = &gpio1;
 		gpio1 = &gpio2;

Signature · 1 line

1.9.

Fabio Estevam

author

2016-09-06 15:53 UTC #1 lore raw

PATCH 2/9 ARM: dts: imx1: Fix memory node build warnings with W=1

Fix the following build warnings with W=1:

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

While at it, also pass the 'device_type' property as recommended by the ePAPR specification.

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

---
 arch/arm/boot/dts/imx1-ads.dts     | 3 ++-
 arch/arm/boot/dts/imx1-apf9328.dts | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

arch/arm/boot/dts/imx1-ads.dts +2 -1

index f504986..3044b76 100644
@@ -20,7 +20,8 @@
 		stdout-path = &uart1;
 	};
 
-	memory {
+	memory at 8000000 {
+		device_type = "memory";
 		reg = <0x08000000 0x04000000>;
 	};

arch/arm/boot/dts/imx1-apf9328.dts +2 -1

index e8b4b52c..ee4b1b1 100644
@@ -20,7 +20,8 @@
 		stdout-path = &uart1;
 	};
 
-	memory {
+	memory at 8000000 {
+		device_type = "memory";
 		reg = <0x08000000 0x00800000>;
 	};
 };

Signature · 1 line

1.9.1

Fabio Estevam

author

2016-09-06 15:53 UTC #2 lore raw

PATCH 3/9 ARM: dts: imx1: Fix cpu node build warnings with W=1

In reply to Fabio Estevam

Fix the following build warnings with W=1:

Warning (unit_address_vs_reg): Node /cpus/cpu at 0 has a unit name, but no reg property

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

---
 arch/arm/boot/dts/imx1.dtsi | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

arch/arm/boot/dts/imx1.dtsi +2 -1

index b792eee..dd3de38 100644
@@ -43,8 +43,9 @@
 		#size-cells = <0>;
 		#address-cells = <1>;
 
-		cpu: cpu at 0 {
+		cpu at 0 {
 			device_type = "cpu";
+			reg = <0>;
 			compatible = "arm,arm920t";
 			operating-points = <200000 1900000>;
 			clock-latency = <62500>;

Signature · 1 line

1.9.1

Fabio Estevam

author

2016-09-06 15:53 UTC #3 lore raw

PATCH 4/9 ARM: dts: imx25: Remove skeleton.dtsi

In reply to Fabio Estevam

The inclusion of skeleton.dtsi causes the following build warning:

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

Instead of fixing skeleton.dtsi, just add the top level definitions for address-cells and size-cell and remove its inclusion.

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

---
 arch/arm/boot/dts/imx25.dtsi | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

arch/arm/boot/dts/imx25.dtsi +3 -1

index af6af87..831d09a 100644
@@ -9,10 +9,12 @@
  * http://www.gnu.org/copyleft/gpl.html
  */
 
-#include "skeleton.dtsi"
 #include "imx25-pinfunc.h"
 
 / {
+	#address-cells = <1>;
+	#size-cells = <1>;
+
 	aliases {
 		ethernet0 = &fec;
 		gpio0 = &gpio1;

Signature · 1 line

1.9.1

Fabio Estevam

author

2016-09-06 15:53 UTC #4 lore raw

PATCH 5/9 ARM: dts: imx25: Fix memory node build warnings with W=1

In reply to Fabio Estevam

Fix the following build warnings with W=1:

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

While at it, also pass the 'device_type' property as recommended by the ePAPR specification.

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

---
 arch/arm/boot/dts/imx25-eukrea-cpuimx25.dtsi | 3 ++-
 arch/arm/boot/dts/imx25-karo-tx25.dts        | 3 ++-
 arch/arm/boot/dts/imx25-pdk.dts              | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

arch/arm/boot/dts/imx25-eukrea-cpuimx25.dtsi +2 -1

index d6f2764..e4d7da2 100644
@@ -17,7 +17,8 @@
 	model = "Eukrea CPUIMX25";
 	compatible = "eukrea,cpuimx25", "fsl,imx25";
 
-	memory {
+	memory at 80000000 {
+		device_type = "memory";
 		reg = <0x80000000 0x4000000>; /* 64M */
 	};
 };

arch/arm/boot/dts/imx25-karo-tx25.dts +2 -1

index 9b31faa..d8ec158 100644
@@ -36,7 +36,8 @@
 		};
 	};
 
-	memory {
+	memory at 80000000 {
+		device_type = "memory";
 		reg = <0x80000000 0x02000000 0x90000000 0x02000000>;
 	};
 };

arch/arm/boot/dts/imx25-pdk.dts +2 -1

index 7029210..8ce72fa 100644
@@ -18,7 +18,8 @@
 	model = "Freescale i.MX25 Product Development Kit";
 	compatible = "fsl,imx25-pdk", "fsl,imx25";
 
-	memory {
+	memory at 80000000 {
+		device_type = "memory";
 		reg = <0x80000000 0x4000000>;
 	};

Signature · 1 line

1.9.1

Fabio Estevam

author

2016-09-06 15:53 UTC #5 lore raw

PATCH 6/9 ARM: dts: imx27: Remove skeleton.dtsi

In reply to Fabio Estevam

The inclusion of skeleton.dtsi causes the following build warning:

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

Instead of fixing skeleton.dtsi, just add the top level definitions for address-cells and size-cell and remove its inclusion.

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

---
 arch/arm/boot/dts/imx27.dtsi | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

arch/arm/boot/dts/imx27.dtsi +3 -1

index f818ea4..9d8b596 100644
@@ -9,7 +9,6 @@
  * http://www.gnu.org/copyleft/gpl.html
  */
 
-#include "skeleton.dtsi"
 #include "imx27-pinfunc.h"
 
 #include <dt-bindings/clock/imx27-clock.h>

@@ -18,6 +17,9 @@
 #include <dt-bindings/interrupt-controller/irq.h>
 
 / {
+	#address-cells = <1>;
+	#size-cells = <1>;
+
 	aliases {
 		ethernet0 = &fec;
 		gpio0 = &gpio1;

Signature · 1 line

1.9.1

Fabio Estevam

author

2016-09-06 15:53 UTC #6 lore raw

PATCH 7/9 ARM: dts: imx27: Fix cpu node build warnings with W=1

In reply to Fabio Estevam

Fix the following build warnings with W=1:

Warning (unit_address_vs_reg): Node /cpus/cpu at 0 has a unit name, but no reg property

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

---
 arch/arm/boot/dts/imx27.dtsi | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

arch/arm/boot/dts/imx27.dtsi +2 -1

index 9d8b596..b76879e 100644
@@ -63,8 +63,9 @@
 		#size-cells = <0>;
 		#address-cells = <1>;
 
-		cpu: cpu at 0 {
+		cpu at 0 {
 			device_type = "cpu";
+			reg = <0>;
 			compatible = "arm,arm926ej-s";
 			operating-points = <
 				/* kHz uV */

Signature · 1 line

1.9.1

Fabio Estevam

author

2016-09-06 15:53 UTC #7 lore raw

PATCH 8/9 ARM: dts: imx27: Fix memory node build warnings with W=1

In reply to Fabio Estevam

Fix the following build warnings with W=1:

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

While at it, also pass the 'device_type' property as recommended by the ePAPR specification.

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

---
 arch/arm/boot/dts/imx27-apf27.dts                 | 3 ++-
 arch/arm/boot/dts/imx27-eukrea-cpuimx27.dtsi      | 3 ++-
 arch/arm/boot/dts/imx27-pdk.dts                   | 3 ++-
 arch/arm/boot/dts/imx27-phytec-phycard-s-som.dtsi | 3 ++-
 arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi   | 3 ++-
 5 files changed, 10 insertions(+), 5 deletions(-)

arch/arm/boot/dts/imx27-apf27.dts +2 -1

index 73aae4f..357eb55 100644
@@ -19,7 +19,8 @@
 	model = "Armadeus Systems APF27 module";
 	compatible = "armadeus,imx27-apf27", "fsl,imx27";
 
-	memory {
+	memory at a0000000 {
+		device_type = "memory";
 		reg = <0xa0000000 0x04000000>;
 	};

arch/arm/boot/dts/imx27-eukrea-cpuimx27.dtsi +2 -1

index 2cf896c..ecdf5e4 100644
@@ -16,7 +16,8 @@
 	model = "Eukrea CPUIMX27";
 	compatible = "eukrea,cpuimx27", "fsl,imx27";
 
-	memory {
+	memory at a0000000 {
+		device_type = "memory";
 		reg = <0xa0000000 0x04000000>;
 	};

arch/arm/boot/dts/imx27-pdk.dts +2 -1

index d0ef496..0bc8a08 100644
@@ -16,7 +16,8 @@
 	model = "Freescale i.MX27 Product Development Kit";
 	compatible = "fsl,imx27-pdk", "fsl,imx27";
 
-	memory {
+	memory at a0000000 {
+		device_type = "memory";
 		reg = <0xa0000000 0x08000000>;
 	};

arch/arm/boot/dts/imx27-phytec-phycard-s-som.dtsi +2 -1

index 1b62480..d3c3bca 100644
@@ -17,7 +17,8 @@
 	model = "Phytec pca100";
 	compatible = "phytec,imx27-pca100", "fsl,imx27";
 
-	memory {
+	memory at a0000000 {
+		device_type = "memory";
 		reg = <0xa0000000 0x08000000>; /* 128MB */
 	};
 };

arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi +2 -1

index b4e955e..1a73122 100644
@@ -16,7 +16,8 @@
 	model = "Phytec pcm038";
 	compatible = "phytec,imx27-pcm038", "fsl,imx27";
 
-	memory {
+	memory at a0000000 {
+		device_type = "memory";
 		reg = <0xa0000000 0x08000000>;
 	};

Signature · 1 line

1.9.1

Fabio Estevam

author

2016-09-06 15:53 UTC #8 lore raw

PATCH 8/9 ARM: dts: imx27: Fix memory node build warnings with W=1

In reply to Fabio Estevam

Fix the following build warnings with W=1:

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

While at it, also pass the 'device_type' property as recommended by the ePAPR specification.

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

---
 arch/arm/boot/dts/imx27-apf27.dts                 | 3 ++-
 arch/arm/boot/dts/imx27-eukrea-cpuimx27.dtsi      | 3 ++-
 arch/arm/boot/dts/imx27-pdk.dts                   | 3 ++-
 arch/arm/boot/dts/imx27-phytec-phycard-s-som.dtsi | 3 ++-
 arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi   | 3 ++-
 5 files changed, 10 insertions(+), 5 deletions(-)

arch/arm/boot/dts/imx27-apf27.dts +2 -1

index 73aae4f..357eb55 100644
@@ -19,7 +19,8 @@
 	model = "Armadeus Systems APF27 module";
 	compatible = "armadeus,imx27-apf27", "fsl,imx27";
 
-	memory {
+	memory at a0000000 {
+		device_type = "memory";
 		reg = <0xa0000000 0x04000000>;
 	};

arch/arm/boot/dts/imx27-eukrea-cpuimx27.dtsi +2 -1

index 2cf896c..ecdf5e4 100644
@@ -16,7 +16,8 @@
 	model = "Eukrea CPUIMX27";
 	compatible = "eukrea,cpuimx27", "fsl,imx27";
 
-	memory {
+	memory at a0000000 {
+		device_type = "memory";
 		reg = <0xa0000000 0x04000000>;
 	};

arch/arm/boot/dts/imx27-pdk.dts +2 -1

index d0ef496..0bc8a08 100644
@@ -16,7 +16,8 @@
 	model = "Freescale i.MX27 Product Development Kit";
 	compatible = "fsl,imx27-pdk", "fsl,imx27";
 
-	memory {
+	memory at a0000000 {
+		device_type = "memory";
 		reg = <0xa0000000 0x08000000>;
 	};

arch/arm/boot/dts/imx27-phytec-phycard-s-som.dtsi +2 -1

index 1b62480..d3c3bca 100644
@@ -17,7 +17,8 @@
 	model = "Phytec pca100";
 	compatible = "phytec,imx27-pca100", "fsl,imx27";
 
-	memory {
+	memory at a0000000 {
+		device_type = "memory";
 		reg = <0xa0000000 0x08000000>; /* 128MB */
 	};
 };

arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi +2 -1

index b4e955e..1a73122 100644
@@ -16,7 +16,8 @@
 	model = "Phytec pcm038";
 	compatible = "phytec,imx27-pcm038", "fsl,imx27";
 
-	memory {
+	memory at a0000000 {
+		device_type = "memory";
 		reg = <0xa0000000 0x08000000>;
 	};

Signature · 1 line

1.9.1

Fabio Estevam

author

2016-09-06 15:53 UTC #9 lore raw

PATCH 9/9 ARM: dts: imx27-eukrea-mbimxsd27-baseboard: Fix ads7846 node build warning with W=1

In reply to Fabio Estevam

Fix the following build warnings with W=1:

Warning (unit_address_vs_reg): Node /soc/aipi at 10000000/cspi at 1000e000/ads7846 has a reg or ranges property, but no unit name

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

---
 arch/arm/boot/dts/imx27-eukrea-mbimxsd27-baseboard.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

arch/arm/boot/dts/imx27-eukrea-mbimxsd27-baseboard.dts +1 -1

index 27846ff..3178467 100644
@@ -85,7 +85,7 @@
 	cs-gpios = <&gpio4 28 GPIO_ACTIVE_LOW>;
 	status = "okay";
 
-	ads7846 {
+	ads7846 at 0 {
 		compatible = "ti,ads7846";
 		pinctrl-names = "default";
 		pinctrl-0 = <&pinctrl_touch>;

Signature · 1 line

1.9.1

Fabio Estevam

reviewer

2016-11-05 19:35 UTC #10 lore raw

PATCH 1/9 ARM: dts: imx1: Remove skeleton.dtsi

In reply to Fabio Estevam

Hi Shawn,

Quoted 8 lines · Fabio Estevam

The inclusion of skeleton.dtsi causes the following build warning:
Warning (unit_address_vs_reg): Node /memory has a reg or ranges property, but no unit name
Instead of fixing skeleton.dtsi, just add the top level definitions for address-cells and size-cell and remove its inclusion.
Signed-off-by Fabio Estevam <[email protected]>

Are you OK with this series?

Shawn Guo

2016-11-07 01:10 UTC #11 lore raw

PATCH 1/9 ARM: dts: imx1: Remove skeleton.dtsi

Quoted 5 lines · Fabio Estevam

Hi Shawn,
Quoted 2 lines · Fabio Estevam
The inclusion of skeleton.dtsi causes the following build warning:

Quoted 8 lines

Quoted 6 lines
Warning (unit_address_vs_reg): Node /memory has a reg or ranges property, but no unit name
Instead of fixing skeleton.dtsi, just add the top level definitions for address-cells and size-cell and remove its inclusion.
Signed-off-by Fabio Estevam <[email protected]>
Are you OK with this series?

Has the series cleaned up all i.MX dts files? I do not like to see so many patches doing such small cleanups. Can we do it with 3 patches maybe?

- one for skeleton.dtsi cleanup
- one for memory node
- one for cpu node

Each one covers all i.MX dts files.

Shawn