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@0 has a unit name, but no reg property

Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

diff --git a/arch/arm/boot/dts/imx1.dtsi b/arch/arm/boot/dts/imx1.dtsi
index b792eee3899b25e7a7a206d16f5737f5fd631a9d..dd3de387a7afde121d2d157a269fae1394d75cd7 100644 (file)
--- a/arch/arm/boot/dts/imx1.dtsi
+++ b/arch/arm/boot/dts/imx1.dtsi
@@ -43,8 +43,9 @@
                #size-cells = <0>;
                #address-cells = <1>;
 
-               cpu: cpu@0 {
+               cpu@0 {
                        device_type = "cpu";
+                       reg = <0>;
                        compatible = "arm,arm920t";
                        operating-points = <200000 1900000>;
                        clock-latency = <62500>;

diff --git a/arch/arm/boot/dts/imx23.dtsi b/arch/arm/boot/dts/imx23.dtsi
index ac2a9da62b6ce81e4130c44185300ac95c31b2ca..96eae6447b25afae7692a17721182d3788ef126e 100644 (file)
--- a/arch/arm/boot/dts/imx23.dtsi
+++ b/arch/arm/boot/dts/imx23.dtsi
@@ -29,12 +29,13 @@
        };
 
        cpus {
-               #address-cells = <0>;
+               #address-cells = <1>;
                #size-cells = <0>;
 
-               cpu {
+               cpu@0 {
                        compatible = "arm,arm926ej-s";
                        device_type = "cpu";
+                       reg = <0>;
                };
        };
 

diff --git a/arch/arm/boot/dts/imx25.dtsi b/arch/arm/boot/dts/imx25.dtsi
index 831d09a28155c5caa0b26ee6be42c20986067536..6a348150b90de2a8cbdb765475d985a0baa352c8 100644 (file)
--- a/arch/arm/boot/dts/imx25.dtsi
+++ b/arch/arm/boot/dts/imx25.dtsi
@@ -43,12 +43,13 @@
        };
 
        cpus {
-               #address-cells = <0>;
+               #address-cells = <1>;
                #size-cells = <0>;
 
-               cpu {
+               cpu@0 {
                        compatible = "arm,arm926ej-s";
                        device_type = "cpu";
+                       reg = <0>;
                };
        };
 

diff --git a/arch/arm/boot/dts/imx27.dtsi b/arch/arm/boot/dts/imx27.dtsi
index 9d8b5969ee3b0d9455afee96c666e77cae1cc713..6a7cb9e193e2df9540ec3dddfb3f48f5de49fafb 100644 (file)
--- a/arch/arm/boot/dts/imx27.dtsi
+++ b/arch/arm/boot/dts/imx27.dtsi
@@ -65,6 +65,7 @@
 
                cpu: cpu@0 {
                        device_type = "cpu";
+                       reg = <0>;
                        compatible = "arm,arm926ej-s";
                        operating-points = <
                                /* kHz uV */

diff --git a/arch/arm/boot/dts/imx28.dtsi b/arch/arm/boot/dts/imx28.dtsi
index 3aabf65a6a5224f5681d6ba189087a550824e964..70927d560d66e88afb7524e61fd22feb5c05466e 100644 (file)
--- a/arch/arm/boot/dts/imx28.dtsi
+++ b/arch/arm/boot/dts/imx28.dtsi
@@ -40,12 +40,13 @@
        };
 
        cpus {
-               #address-cells = <0>;
+               #address-cells = <1>;
                #size-cells = <0>;
 
-               cpu {
+               cpu@0 {
                        compatible = "arm,arm926ej-s";
                        device_type = "cpu";
+                       reg = <0>;
                };
        };
 

diff --git a/arch/arm/boot/dts/imx31.dtsi b/arch/arm/boot/dts/imx31.dtsi
index 685916e3d8a1eaefb083d2a7a81583c18a360168..aa4d9cb786d355982c74390e1a2012d62d408c37 100644 (file)
--- a/arch/arm/boot/dts/imx31.dtsi
+++ b/arch/arm/boot/dts/imx31.dtsi
@@ -22,12 +22,13 @@
        };
 
        cpus {
-               #address-cells = <0>;
+               #address-cells = <1>;
                #size-cells = <0>;
 
-               cpu {
+               cpu@0 {
                        compatible = "arm,arm1136jf-s";
                        device_type = "cpu";
+                       reg = <0>;
                };
        };
 

diff --git a/arch/arm/boot/dts/imx35.dtsi b/arch/arm/boot/dts/imx35.dtsi
index 9f40e6229189f3c6cb72c99bc11c351598e7f0e3..6f7b943378f67e2aad69c0eb8d4be3fcc8f05a28 100644 (file)
--- a/arch/arm/boot/dts/imx35.dtsi
+++ b/arch/arm/boot/dts/imx35.dtsi
@@ -27,12 +27,13 @@
        };
 
        cpus {
-               #address-cells = <0>;
+               #address-cells = <1>;
                #size-cells = <0>;
 
-               cpu {
+               cpu@0 {
                        compatible = "arm,arm1136jf-s";
                        device_type = "cpu";
+                       reg = <0>;
                };
        };