Skip to content

Commit ee42334

Browse files
Liang Chenrkhuangtao
authored andcommitted
arm: dts: adjust opp-table by different bin for rk3288 SoCs
Change-Id: I3e84e8c33237bde39cb5db34f68cea7255c41eae Signed-off-by: Liang Chen <cl@rock-chips.com>
1 parent c6273e1 commit ee42334

3 files changed

Lines changed: 20 additions & 16 deletions

File tree

arch/arm/boot/dts/rk3288.dtsi

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,8 @@
141141
rockchip,bin-scaling-sel = <
142142
0 17
143143
1 25
144-
2 31
144+
2 27
145+
3 31
145146
>;
146147
rockchip,pvtm-voltage-sel = <
147148
0 14300 0
@@ -234,8 +235,8 @@
234235
};
235236
opp-1416000000 {
236237
opp-hz = /bits/ 64 <1416000000>;
237-
opp-microvolt = <1350000 1350000 1350000>;
238-
opp-microvolt-L0 = <1350000 1350000 1350000>;
238+
opp-microvolt = <1300000 1300000 1350000>;
239+
opp-microvolt-L0 = <1300000 1300000 1350000>;
239240
opp-microvolt-L1 = <1250000 1250000 1350000>;
240241
opp-microvolt-L2 = <1200000 1200000 1350000>;
241242
opp-microvolt-L3 = <1150000 1150000 1350000>;
@@ -1729,8 +1730,8 @@
17291730
opp-hz = /bits/ 64 <400000000>;
17301731
opp-microvolt = <1100000>;
17311732
};
1732-
opp-480000000 {
1733-
opp-hz = /bits/ 64 <480000000>;
1733+
opp-500000000 {
1734+
opp-hz = /bits/ 64 <500000000>;
17341735
opp-microvolt = <1200000>;
17351736
};
17361737
};

arch/arm/boot/dts/rk3288cg-opp.dtsi

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,23 @@
44
*/
55

66
&cpu0_opp_table {
7+
rockchip,max-volt = <1400000>;
78
opp-1704000000 {
89
opp-hz = /bits/ 64 <1704000000>;
9-
opp-microvolt = <1350000 1350000 1350000>;
10-
opp-microvolt-L0 = <1350000 1350000 1350000>;
11-
opp-microvolt-L1 = <1350000 1350000 1350000>;
12-
opp-microvolt-L2 = <1350000 1350000 1350000>;
13-
opp-microvolt-L3 = <1300000 1300000 1350000>;
10+
opp-microvolt = <1350000 1350000 1400000>;
11+
opp-microvolt-L0 = <1350000 1350000 1400000>;
12+
opp-microvolt-L1 = <1350000 1350000 1400000>;
13+
opp-microvolt-L2 = <1350000 1350000 1400000>;
14+
opp-microvolt-L3 = <1350000 1350000 1400000>;
1415
clock-latency-ns = <40000>;
1516
};
1617
opp-1800000000 {
1718
opp-hz = /bits/ 64 <1800000000>;
18-
opp-microvolt = <1350000 1350000 1350000>;
19-
opp-microvolt-L0 = <1350000 1350000 1350000>;
20-
opp-microvolt-L1 = <1350000 1350000 1350000>;
21-
opp-microvolt-L2 = <1350000 1350000 1350000>;
22-
opp-microvolt-L3 = <1350000 1350000 1350000>;
19+
opp-microvolt = <1400000 1400000 1400000>;
20+
opp-microvolt-L0 = <1400000 1400000 1400000>;
21+
opp-microvolt-L1 = <1400000 1400000 1400000>;
22+
opp-microvolt-L2 = <1400000 1400000 1400000>;
23+
opp-microvolt-L3 = <1400000 1400000 1400000>;
2324
clock-latency-ns = <40000>;
2425
};
2526
};

drivers/cpufreq/rockchip-cpufreq.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,9 @@ static int rk3288_get_soc_info(struct device *dev, struct device_node *np,
7575
dev_err(dev, "Failed to get soc performance value\n");
7676
goto out;
7777
}
78-
if (value == 0x2)
78+
if (value & 0x2)
79+
*bin = 3;
80+
else if (value & 0x01)
7981
*bin = 2;
8082
}
8183
if (*bin >= 0)

0 commit comments

Comments
 (0)