Skip to content

Commit 709a25f

Browse files
robherringmmind
authored andcommitted
ARM: dts: rockchip: Drop redundant CPU "clock-latency"
The "clock-latency" property is part of the deprecated opp-v1 binding and is redundant if the opp-v2 table has equal or larger values in any "clock-latency-ns". Add any missing "clock-latency-ns" properties and remove "clock-latency". Signed-off-by: "Rob Herring (Arm)" <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Heiko Stuebner <[email protected]>
1 parent d15d8d2 commit 709a25f

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

arch/arm/boot/dts/rockchip/rk3128.dtsi

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@
4848
device_type = "cpu";
4949
compatible = "arm,cortex-a7";
5050
reg = <0xf00>;
51-
clock-latency = <40000>;
5251
clocks = <&cru ARMCLK>;
5352
resets = <&cru SRST_CORE0>;
5453
operating-points-v2 = <&cpu_opp_table>;
@@ -87,31 +86,38 @@
8786
opp-216000000 {
8887
opp-hz = /bits/ 64 <216000000>;
8988
opp-microvolt = <950000 950000 1325000>;
89+
clock-latency-ns = <40000>;
9090
};
9191
opp-408000000 {
9292
opp-hz = /bits/ 64 <408000000>;
9393
opp-microvolt = <950000 950000 1325000>;
94+
clock-latency-ns = <40000>;
9495
};
9596
opp-600000000 {
9697
opp-hz = /bits/ 64 <600000000>;
9798
opp-microvolt = <950000 950000 1325000>;
99+
clock-latency-ns = <40000>;
98100
};
99101
opp-696000000 {
100102
opp-hz = /bits/ 64 <696000000>;
101103
opp-microvolt = <975000 975000 1325000>;
104+
clock-latency-ns = <40000>;
102105
};
103106
opp-816000000 {
104107
opp-hz = /bits/ 64 <816000000>;
105108
opp-microvolt = <1075000 1075000 1325000>;
106109
opp-suspend;
110+
clock-latency-ns = <40000>;
107111
};
108112
opp-1008000000 {
109113
opp-hz = /bits/ 64 <1008000000>;
110114
opp-microvolt = <1200000 1200000 1325000>;
115+
clock-latency-ns = <40000>;
111116
};
112117
opp-1200000000 {
113118
opp-hz = /bits/ 64 <1200000000>;
114119
opp-microvolt = <1325000 1325000 1325000>;
120+
clock-latency-ns = <40000>;
115121
};
116122
};
117123

arch/arm/boot/dts/rockchip/rk3188.dtsi

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
compatible = "arm,cortex-a9";
2424
next-level-cache = <&L2>;
2525
reg = <0x0>;
26-
clock-latency = <40000>;
2726
clocks = <&cru ARMCLK>;
2827
operating-points-v2 = <&cpu0_opp_table>;
2928
resets = <&cru SRST_CORE0>;

arch/arm/boot/dts/rockchip/rk322x.dtsi

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
resets = <&cru SRST_CORE0>;
3737
operating-points-v2 = <&cpu0_opp_table>;
3838
#cooling-cells = <2>; /* min followed by max */
39-
clock-latency = <40000>;
4039
clocks = <&cru ARMCLK>;
4140
enable-method = "psci";
4241
};

arch/arm/boot/dts/rockchip/rk3288.dtsi

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@
7070
resets = <&cru SRST_CORE0>;
7171
operating-points-v2 = <&cpu_opp_table>;
7272
#cooling-cells = <2>; /* min followed by max */
73-
clock-latency = <40000>;
7473
clocks = <&cru ARMCLK>;
7574
dynamic-power-coefficient = <370>;
7675
};
@@ -81,7 +80,6 @@
8180
resets = <&cru SRST_CORE1>;
8281
operating-points-v2 = <&cpu_opp_table>;
8382
#cooling-cells = <2>; /* min followed by max */
84-
clock-latency = <40000>;
8583
clocks = <&cru ARMCLK>;
8684
dynamic-power-coefficient = <370>;
8785
};
@@ -92,7 +90,6 @@
9290
resets = <&cru SRST_CORE2>;
9391
operating-points-v2 = <&cpu_opp_table>;
9492
#cooling-cells = <2>; /* min followed by max */
95-
clock-latency = <40000>;
9693
clocks = <&cru ARMCLK>;
9794
dynamic-power-coefficient = <370>;
9895
};
@@ -103,7 +100,6 @@
103100
resets = <&cru SRST_CORE3>;
104101
operating-points-v2 = <&cpu_opp_table>;
105102
#cooling-cells = <2>; /* min followed by max */
106-
clock-latency = <40000>;
107103
clocks = <&cru ARMCLK>;
108104
dynamic-power-coefficient = <370>;
109105
};
@@ -116,6 +112,7 @@
116112
opp-126000000 {
117113
opp-hz = /bits/ 64 <126000000>;
118114
opp-microvolt = <900000>;
115+
clock-latency-ns = <40000>;
119116
};
120117
opp-216000000 {
121118
opp-hz = /bits/ 64 <216000000>;

arch/arm/boot/dts/rockchip/rv1108.dtsi

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
device_type = "cpu";
3333
compatible = "arm,cortex-a7";
3434
reg = <0xf00>;
35-
clock-latency = <40000>;
3635
clocks = <&cru ARMCLK>;
3736
#cooling-cells = <2>; /* min followed by max */
3837
dynamic-power-coefficient = <75>;

0 commit comments

Comments
 (0)