Skip to content

Commit f167175

Browse files
finley1226rkhuangtao
authored andcommitted
arm: dts: rockchip: Change cpu opp-microvolt form one entry to three
Single entry is for target voltage and three entries are for <target min max> voltages. Change cpu opp-microvolt form one entry to three entries and set maximum acceptable voltage to a high value so that regulator device can supply multiple consumers at the same time. Change-Id: I3a0dc4e161bae33e36b232c36a0a05a3102359ef Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
1 parent 7872d76 commit f167175

12 files changed

Lines changed: 235 additions & 235 deletions

File tree

arch/arm/boot/dts/rk3036.dtsi

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -95,28 +95,28 @@
9595

9696
opp-408000000 {
9797
opp-hz = /bits/ 64 <408000000>;
98-
opp-microvolt = <1000000>;
98+
opp-microvolt = <1000000 1000000 1225000>;
9999
clock-latency-ns = <40000>;
100100
};
101101
opp-600000000 {
102102
opp-hz = /bits/ 64 <600000000>;
103-
opp-microvolt = <1000000>;
103+
opp-microvolt = <1000000 1000000 1225000>;
104104
clock-latency-ns = <40000>;
105105
};
106106
opp-816000000 {
107107
opp-hz = /bits/ 64 <816000000>;
108-
opp-microvolt = <1100000>;
108+
opp-microvolt = <1100000 1100000 1225000>;
109109
clock-latency-ns = <40000>;
110110
opp-suspend;
111111
};
112112
opp-1008000000 {
113113
opp-hz = /bits/ 64 <1008000000>;
114-
opp-microvolt = <1150000>;
114+
opp-microvolt = <1150000 1150000 1225000>;
115115
clock-latency-ns = <40000>;
116116
};
117117
opp-1200000000 {
118118
opp-hz = /bits/ 64 <1200000000>;
119-
opp-microvolt = <1225000>;
119+
opp-microvolt = <1225000 1225000 1225000>;
120120
clock-latency-ns = <40000>;
121121
};
122122
};

arch/arm/boot/dts/rk3066a.dtsi

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,25 +77,25 @@
7777

7878
opp-312000000 {
7979
opp-hz = /bits/ 64 <312000000>;
80-
opp-microvolt = <1075000>;
80+
opp-microvolt = <1075000 1075000 1125000>;
8181
clock-latency-ns = <40000>;
8282
status = "disabled";
8383
};
8484
opp-504000000 {
8585
opp-hz = /bits/ 64 <504000000>;
86-
opp-microvolt = <1100000>;
86+
opp-microvolt = <1100000 1100000 1125000>;
8787
clock-latency-ns = <40000>;
8888
status = "disabled";
8989
};
9090
opp-816000000 {
9191
opp-hz = /bits/ 64 <816000000>;
92-
opp-microvolt = <1125000>;
92+
opp-microvolt = <1125000 1125000 1125000>;
9393
clock-latency-ns = <40000>;
9494
status = "disabled";
9595
};
9696
opp-1008000000 {
9797
opp-hz = /bits/ 64 <1008000000>;
98-
opp-microvolt = <1125000>;
98+
opp-microvolt = <1125000 1125000 1125000>;
9999
clock-latency-ns = <40000>;
100100
status = "disabled";
101101
};

arch/arm/boot/dts/rk312x.dtsi

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -115,59 +115,59 @@
115115

116116
opp-216000000 {
117117
opp-hz = /bits/ 64 <216000000>;
118-
opp-microvolt = <950000>;
119-
opp-microvolt-L0 = <950000>;
120-
opp-microvolt-L1 = <950000>;
121-
opp-microvolt-L2 = <950000>;
118+
opp-microvolt = <950000 950000 1425000>;
119+
opp-microvolt-L0 = <950000 950000 1425000>;
120+
opp-microvolt-L1 = <950000 950000 1425000>;
121+
opp-microvolt-L2 = <950000 950000 1425000>;
122122
clock-latency-ns = <40000>;
123123
};
124124
opp-408000000 {
125125
opp-hz = /bits/ 64 <408000000>;
126-
opp-microvolt = <950000>;
127-
opp-microvolt-L0 = <950000>;
128-
opp-microvolt-L1 = <950000>;
129-
opp-microvolt-L2 = <950000>;
126+
opp-microvolt = <950000 950000 1425000>;
127+
opp-microvolt-L0 = <950000 950000 1425000>;
128+
opp-microvolt-L1 = <950000 950000 1425000>;
129+
opp-microvolt-L2 = <950000 950000 1425000>;
130130
clock-latency-ns = <40000>;
131131
};
132132
opp-600000000 {
133133
opp-hz = /bits/ 64 <600000000>;
134-
opp-microvolt = <1075000>;
135-
opp-microvolt-L0 = <1075000>;
136-
opp-microvolt-L1 = <1025000>;
137-
opp-microvolt-L2 = <975000>;
134+
opp-microvolt = <1075000 1075000 1425000>;
135+
opp-microvolt-L0 = <1075000 1075000 1425000>;
136+
opp-microvolt-L1 = <1025000 1025000 1425000>;
137+
opp-microvolt-L2 = <975000 975000 1425000>;
138138
clock-latency-ns = <40000>;
139139
};
140140
opp-696000000 {
141141
opp-hz = /bits/ 64 <696000000>;
142-
opp-microvolt = <1150000>;
143-
opp-microvolt-L0 = <1150000>;
144-
opp-microvolt-L1 = <1100000>;
145-
opp-microvolt-L2 = <1050000>;
142+
opp-microvolt = <1150000 1150000 1425000>;
143+
opp-microvolt-L0 = <1150000 1150000 1425000>;
144+
opp-microvolt-L1 = <1100000 1100000 1425000>;
145+
opp-microvolt-L2 = <1050000 1050000 1425000>;
146146
clock-latency-ns = <40000>;
147147
};
148148
opp-816000000 {
149149
opp-hz = /bits/ 64 <816000000>;
150-
opp-microvolt = <1200000>;
151-
opp-microvolt-L0 = <1200000>;
152-
opp-microvolt-L1 = <1150000>;
153-
opp-microvolt-L2 = <1100000>;
150+
opp-microvolt = <1200000 1200000 1425000>;
151+
opp-microvolt-L0 = <1200000 1200000 1425000>;
152+
opp-microvolt-L1 = <1150000 1150000 1425000>;
153+
opp-microvolt-L2 = <1100000 1100000 1425000>;
154154
clock-latency-ns = <40000>;
155155
opp-suspend;
156156
};
157157
opp-1008000000 {
158158
opp-hz = /bits/ 64 <1008000000>;
159-
opp-microvolt = <1325000>;
160-
opp-microvolt-L0 = <1325000>;
161-
opp-microvolt-L1 = <1275000>;
162-
opp-microvolt-L2 = <1225000>;
159+
opp-microvolt = <1325000 1325000 1425000>;
160+
opp-microvolt-L0 = <1325000 1325000 1425000>;
161+
opp-microvolt-L1 = <1275000 1275000 1425000>;
162+
opp-microvolt-L2 = <1225000 1225000 1425000>;
163163
clock-latency-ns = <40000>;
164164
};
165165
opp-1200000000 {
166166
opp-hz = /bits/ 64 <1200000000>;
167-
opp-microvolt = <1425000>;
168-
opp-microvolt-L0 = <1425000>;
169-
opp-microvolt-L1 = <1425000>;
170-
opp-microvolt-L2 = <1375000>;
167+
opp-microvolt = <1425000 1425000 1425000>;
168+
opp-microvolt-L0 = <1425000 1425000 1425000>;
169+
opp-microvolt-L1 = <1425000 1425000 1425000>;
170+
opp-microvolt-L2 = <1375000 1375000 1425000>;
171171
clock-latency-ns = <40000>;
172172
};
173173
};

arch/arm/boot/dts/rk3229-cpu-opp.dtsi

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -58,53 +58,53 @@
5858

5959
opp-408000000 {
6060
opp-hz = /bits/ 64 <408000000>;
61-
opp-microvolt = <950000>;
62-
opp-microvolt-L0 = <950000>;
63-
opp-microvolt-L1 = <950000>;
61+
opp-microvolt = <950000 950000 1400000>;
62+
opp-microvolt-L0 = <950000 950000 1400000>;
63+
opp-microvolt-L1 = <950000 950000 1400000>;
6464
clock-latency-ns = <40000>;
6565
opp-suspend;
6666
};
6767
opp-600000000 {
6868
opp-hz = /bits/ 64 <600000000>;
69-
opp-microvolt = <975000>;
70-
opp-microvolt-L0 = <975000>;
71-
opp-microvolt-L1 = <975000>;
69+
opp-microvolt = <975000 975000 1400000>;
70+
opp-microvolt-L0 = <975000 975000 1400000>;
71+
opp-microvolt-L1 = <975000 975000 1400000>;
7272
};
7373
opp-816000000 {
7474
opp-hz = /bits/ 64 <816000000>;
75-
opp-microvolt = <1000000>;
76-
opp-microvolt-L0 = <1000000>;
77-
opp-microvolt-L1 = <1000000>;
75+
opp-microvolt = <1000000 1000000 1400000>;
76+
opp-microvolt-L0 = <1000000 1000000 1400000>;
77+
opp-microvolt-L1 = <1000000 1000000 1400000>;
7878
};
7979
opp-1008000000 {
8080
opp-hz = /bits/ 64 <1008000000>;
81-
opp-microvolt = <1175000>;
82-
opp-microvolt-L0 = <1175000>;
83-
opp-microvolt-L1 = <1125000>;
81+
opp-microvolt = <1175000 1175000 1400000>;
82+
opp-microvolt-L0 = <1175000 1175000 1400000>;
83+
opp-microvolt-L1 = <1125000 1125000 1400000>;
8484
};
8585
opp-1200000000 {
8686
opp-hz = /bits/ 64 <1200000000>;
87-
opp-microvolt = <1275000>;
88-
opp-microvolt-L0 = <1275000>;
89-
opp-microvolt-L1 = <1225000>;
87+
opp-microvolt = <1275000 1275000 1400000>;
88+
opp-microvolt-L0 = <1275000 1275000 1400000>;
89+
opp-microvolt-L1 = <1225000 1225000 1400000>;
9090
};
9191
opp-1296000000 {
9292
opp-hz = /bits/ 64 <1296000000>;
93-
opp-microvolt = <1325000>;
94-
opp-microvolt-L0 = <1325000>;
95-
opp-microvolt-L1 = <1275000>;
93+
opp-microvolt = <1325000 1325000 1400000>;
94+
opp-microvolt-L0 = <1325000 1325000 1400000>;
95+
opp-microvolt-L1 = <1275000 1275000 1400000>;
9696
};
9797
opp-1392000000 {
9898
opp-hz = /bits/ 64 <1392000000>;
99-
opp-microvolt = <1375000>;
100-
opp-microvolt-L0 = <1375000>;
101-
opp-microvolt-L1 = <1325000>;
99+
opp-microvolt = <1375000 1375000 1400000>;
100+
opp-microvolt-L0 = <1375000 1375000 1400000>;
101+
opp-microvolt-L1 = <1325000 1325000 1400000>;
102102
};
103103
opp-1464000000 {
104104
opp-hz = /bits/ 64 <1464000000>;
105-
opp-microvolt = <1400000>;
106-
opp-microvolt-L0 = <1400000>;
107-
opp-microvolt-L1 = <1350000>;
105+
opp-microvolt = <1400000 1400000 1400000>;
106+
opp-microvolt-L0 = <1400000 1400000 1400000>;
107+
opp-microvolt-L1 = <1350000 1350000 1400000>;
108108
};
109109
};
110110
};

arch/arm/boot/dts/rk322x.dtsi

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -117,35 +117,35 @@
117117

118118
opp-408000000 {
119119
opp-hz = /bits/ 64 <408000000>;
120-
opp-microvolt = <950000>;
121-
opp-microvolt-L0 = <950000>;
122-
opp-microvolt-L1 = <950000>;
120+
opp-microvolt = <950000 950000 1275000>;
121+
opp-microvolt-L0 = <950000 950000 1275000>;
122+
opp-microvolt-L1 = <950000 950000 1275000>;
123123
clock-latency-ns = <40000>;
124124
opp-suspend;
125125
};
126126
opp-600000000 {
127127
opp-hz = /bits/ 64 <600000000>;
128-
opp-microvolt = <975000>;
129-
opp-microvolt-L0 = <975000>;
130-
opp-microvolt-L1 = <975000>;
128+
opp-microvolt = <975000 975000 1275000>;
129+
opp-microvolt-L0 = <975000 975000 1275000>;
130+
opp-microvolt-L1 = <975000 975000 1275000>;
131131
};
132132
opp-816000000 {
133133
opp-hz = /bits/ 64 <816000000>;
134-
opp-microvolt = <1000000>;
135-
opp-microvolt-L0 = <1000000>;
136-
opp-microvolt-L1 = <1000000>;
134+
opp-microvolt = <1000000 1000000 1275000>;
135+
opp-microvolt-L0 = <1000000 1000000 1275000>;
136+
opp-microvolt-L1 = <1000000 1000000 1275000>;
137137
};
138138
opp-1008000000 {
139139
opp-hz = /bits/ 64 <1008000000>;
140-
opp-microvolt = <1175000>;
141-
opp-microvolt-L0 = <1175000>;
142-
opp-microvolt-L1 = <1125000>;
140+
opp-microvolt = <1175000 1175000 1275000>;
141+
opp-microvolt-L0 = <1175000 1175000 1275000>;
142+
opp-microvolt-L1 = <1125000 1125000 1275000>;
143143
};
144144
opp-1200000000 {
145145
opp-hz = /bits/ 64 <1200000000>;
146-
opp-microvolt = <1275000>;
147-
opp-microvolt-L0 = <1275000>;
148-
opp-microvolt-L1 = <1225000>;
146+
opp-microvolt = <1275000 1275000 1275000>;
147+
opp-microvolt-L0 = <1275000 1275000 1275000>;
148+
opp-microvolt-L1 = <1225000 1225000 1275000>;
149149
};
150150
};
151151

arch/arm/boot/dts/rk3288-android.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@
403403

404404
opp-1800000000 {
405405
opp-hz = /bits/ 64 <1800000000>;
406-
opp-microvolt = <1350000>;
406+
opp-microvolt = <1350000 1350000 1350000>;
407407
clock-latency-ns = <40000>;
408408
status = "disabled";
409409
};

0 commit comments

Comments
 (0)