Skip to contentSkip to conversation

ARM: dts: imx: Adjust CPU nodes

PATCH New Fabio Estevam 2 participants 2 messages Nov 16, 2016 – Dec 30, 2016

Subsystems (2)
Device tree bindings Arm i.MX and Layerscape
lore
Share & tools
lore

Fabio Estevam

author
#0 lore raw

PATCH 1/1 ARM: dts: imx: Adjust CPU nodes

Make CPU nodes consistent throughout the i.MX dts files, which also matches the description from ePAPR spec.

This also fixes the following W=1 warning in some cases:

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 ++-
 arch/arm/boot/dts/imx23.dtsi | 5 +++--
 arch/arm/boot/dts/imx25.dtsi | 5 +++--
 arch/arm/boot/dts/imx27.dtsi | 1 +
 arch/arm/boot/dts/imx28.dtsi | 5 +++--
 arch/arm/boot/dts/imx31.dtsi | 5 +++--
 arch/arm/boot/dts/imx35.dtsi | 5 +++--
 7 files changed, 18 insertions(+), 11 deletions(-)
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>;
arch/arm/boot/dts/imx23.dtsi +3 -2
index ac2a9da..96eae64 100644
@@ -29,12 +29,13 @@
 	};
 
 	cpus {
-		#address-cells = <0>;
+		#address-cells = <1>;
 		#size-cells = <0>;
 
-		cpu {
+		cpu at 0 {
 			compatible = "arm,arm926ej-s";
 			device_type = "cpu";
+			reg = <0>;
 		};
 	};
arch/arm/boot/dts/imx25.dtsi +3 -2
index 831d09a..6a34815 100644
@@ -43,12 +43,13 @@
 	};
 
 	cpus {
-		#address-cells = <0>;
+		#address-cells = <1>;
 		#size-cells = <0>;
 
-		cpu {
+		cpu at 0 {
 			compatible = "arm,arm926ej-s";
 			device_type = "cpu";
+			reg = <0>;
 		};
 	};
arch/arm/boot/dts/imx27.dtsi +1 -0
index 9d8b596..6a7cb9e 100644
@@ -65,6 +65,7 @@
 
 		cpu: cpu at 0 {
 			device_type = "cpu";
+			reg = <0>;
 			compatible = "arm,arm926ej-s";
 			operating-points = <
 				/* kHz uV */
arch/arm/boot/dts/imx28.dtsi +3 -2
index 3aabf65..70927d5 100644
@@ -40,12 +40,13 @@
 	};
 
 	cpus {
-		#address-cells = <0>;
+		#address-cells = <1>;
 		#size-cells = <0>;
 
-		cpu {
+		cpu at 0 {
 			compatible = "arm,arm926ej-s";
 			device_type = "cpu";
+			reg = <0>;
 		};
 	};
arch/arm/boot/dts/imx31.dtsi +3 -2
index 685916e..aa4d9cb 100644
@@ -22,12 +22,13 @@
 	};
 
 	cpus {
-		#address-cells = <0>;
+		#address-cells = <1>;
 		#size-cells = <0>;
 
-		cpu {
+		cpu at 0 {
 			compatible = "arm,arm1136jf-s";
 			device_type = "cpu";
+			reg = <0>;
 		};
 	};
arch/arm/boot/dts/imx35.dtsi +3 -2
index 9f40e62..6f7b943 100644
@@ -27,12 +27,13 @@
 	};
 
 	cpus {
-		#address-cells = <0>;
+		#address-cells = <1>;
 		#size-cells = <0>;
 
-		cpu {
+		cpu at 0 {
 			compatible = "arm,arm1136jf-s";
 			device_type = "cpu";
+			reg = <0>;
 		};
 	};
Signature · 1 line
2.7.4
Applied
#1 lore raw

PATCH 1/1 ARM: dts: imx: Adjust CPU nodes

Quoted 8 lines · Fabio Estevam

Make CPU nodes consistent throughout the i.MX dts files, which also matches the description from ePAPR spec.

This also fixes the following W=1 warning in some cases:

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]>

Applied, thanks.