Skip to content

Commit d447dd8

Browse files
Fabio EstevamShawn Guo
authored andcommitted
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 <[email protected]> Signed-off-by: Shawn Guo <[email protected]>
1 parent 0c744ea commit d447dd8

File tree

7 files changed

+18
-11
lines changed

7 files changed

+18
-11
lines changed

arch/arm/boot/dts/imx1.dtsi

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,9 @@
4343
#size-cells = <0>;
4444
#address-cells = <1>;
4545

46-
cpu: cpu@0 {
46+
cpu@0 {
4747
device_type = "cpu";
48+
reg = <0>;
4849
compatible = "arm,arm920t";
4950
operating-points = <200000 1900000>;
5051
clock-latency = <62500>;

arch/arm/boot/dts/imx23.dtsi

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,13 @@
2929
};
3030

3131
cpus {
32-
#address-cells = <0>;
32+
#address-cells = <1>;
3333
#size-cells = <0>;
3434

35-
cpu {
35+
cpu@0 {
3636
compatible = "arm,arm926ej-s";
3737
device_type = "cpu";
38+
reg = <0>;
3839
};
3940
};
4041

arch/arm/boot/dts/imx25.dtsi

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,13 @@
4343
};
4444

4545
cpus {
46-
#address-cells = <0>;
46+
#address-cells = <1>;
4747
#size-cells = <0>;
4848

49-
cpu {
49+
cpu@0 {
5050
compatible = "arm,arm926ej-s";
5151
device_type = "cpu";
52+
reg = <0>;
5253
};
5354
};
5455

arch/arm/boot/dts/imx27.dtsi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@
6565

6666
cpu: cpu@0 {
6767
device_type = "cpu";
68+
reg = <0>;
6869
compatible = "arm,arm926ej-s";
6970
operating-points = <
7071
/* kHz uV */

arch/arm/boot/dts/imx28.dtsi

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,13 @@
4040
};
4141

4242
cpus {
43-
#address-cells = <0>;
43+
#address-cells = <1>;
4444
#size-cells = <0>;
4545

46-
cpu {
46+
cpu@0 {
4747
compatible = "arm,arm926ej-s";
4848
device_type = "cpu";
49+
reg = <0>;
4950
};
5051
};
5152

arch/arm/boot/dts/imx31.dtsi

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,13 @@
2222
};
2323

2424
cpus {
25-
#address-cells = <0>;
25+
#address-cells = <1>;
2626
#size-cells = <0>;
2727

28-
cpu {
28+
cpu@0 {
2929
compatible = "arm,arm1136jf-s";
3030
device_type = "cpu";
31+
reg = <0>;
3132
};
3233
};
3334

arch/arm/boot/dts/imx35.dtsi

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,13 @@
2727
};
2828

2929
cpus {
30-
#address-cells = <0>;
30+
#address-cells = <1>;
3131
#size-cells = <0>;
3232

33-
cpu {
33+
cpu@0 {
3434
compatible = "arm,arm1136jf-s";
3535
device_type = "cpu";
36+
reg = <0>;
3637
};
3738
};
3839

0 commit comments

Comments
 (0)