Skip to content

Commit 2ff885f

Browse files
cvpcscvpcs
committed
more fixes to the auto voltage stuff
1 parent 67a246b commit 2ff885f

File tree

1 file changed

+45
-45
lines changed

1 file changed

+45
-45
lines changed

‎arch/arm/mach-omap2/board-sholes.c‎

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -105,74 +105,74 @@
105105

106106
#define SHOLES_MMCPROBE_ENABLED 0
107107

108-
#ifdef CONFIG_SHOLES_OC_MIN_125
108+
#if defined(CONFIG_SHOLES_OC_MIN_125)
109109
#define SHOLES_FREQ_1 125000000
110110

111-
#ifdef CONFIG_SHOLES_OC_LV
111+
#if defined(CONFIG_SHOLES_OC_LV)
112112
#define SHOLES_VSEL_1 0x20
113-
#elif CONFIG_SHOLES_OC_SV
113+
#elif defined(CONFIG_SHOLES_OC_SV)
114114
#define SHOLES_VSEL_1 0x27
115-
#elif CONFIG_SHOLES_OC_IV
115+
#elif defined(CONFIG_SHOLES_OC_IV)
116116
#define SHOLES_VSEL_1 0x27
117117
#else
118118
#define SHOLES_VSEL_1 0x20
119119
#endif
120-
#elif CONFIG_SHOLES_OC_MIN_250
120+
#elif defined(CONFIG_SHOLES_OC_MIN_250)
121121
#define SHOLES_FREQ_1 250000000
122122

123-
#ifdef CONFIG_SHOLES_OC_LV
123+
#if defined(CONFIG_SHOLES_OC_LV)
124124
#define SHOLES_VSEL_1 0x20
125-
#elif CONFIG_SHOLES_OC_SV
125+
#elif defined(CONFIG_SHOLES_OC_SV)
126126
#define SHOLES_VSEL_1 0x27
127-
#elif CONFIG_SHOLES_OC_IV
127+
#elif defined(CONFIG_SHOLES_OC_IV)
128128
#define SHOLES_VSEL_1 0x27
129129
#else
130130
#define SHOLES_VSEL_1 0x20
131131
#endif
132132
#else
133133
#define SHOLES_FREQ_1 125000000
134134

135-
#ifdef CONFIG_SHOLES_OC_LV
135+
#if defined(CONFIG_SHOLES_OC_LV)
136136
#define SHOLES_VSEL_1 0x20
137-
#elif CONFIG_SHOLES_OC_SV
137+
#elif defined(CONFIG_SHOLES_OC_SV)
138138
#define SHOLES_VSEL_1 0x27
139-
#elif CONFIG_SHOLES_OC_IV
139+
#elif defined(CONFIG_SHOLES_OC_IV)
140140
#define SHOLES_VSEL_1 0x27
141141
#else
142142
#define SHOLES_VSEL_1 0x20
143143
#endif
144144
#endif
145145

146146
#define SHOLES_FREQ_2 400000000
147-
#ifdef CONFIG_SHOLES_OC_LV
147+
#if defined(CONFIG_SHOLES_OC_LV)
148148
#define SHOLES_VSEL_2 0x28
149-
#elif CONFIG_SHOLES_OC_SV
149+
#elif defined(CONFIG_SHOLES_OC_SV)
150150
#define SHOLES_VSEL_2 0x32
151-
#elif CONFIG_SHOLES_OC_IV
151+
#elif defined(CONFIG_SHOLES_OC_IV)
152152
#define SHOLES_VSEL_2 0x32
153153
#else
154154
#define SHOLES_VSEL_2 0x28
155155
#endif
156156

157-
#ifdef CONFIG_SHOLES_MAX_800
157+
#if defined(CONFIG_SHOLES_OC_MAX_800)
158158
#define SHOLES_FREQ_3 550000000
159159
#define SHOLES_FREQ_4 600000000
160160
#define SHOLES_FREQ_5 700000000
161161
#define SHOLES_FREQ_6 750000000
162162
#define SHOLES_FREQ_7 800000000
163-
#ifdef CONFIG_SHOLES_OC_LV
163+
#if defined(CONFIG_SHOLES_OC_LV)
164164
#define SHOLES_VSEL_3 0x32
165165
#define SHOLES_VSEL_4 0x34
166166
#define SHOLES_VSEL_5 0x38
167167
#define SHOLES_VSEL_6 0x38
168168
#define SHOLES_VSEL_7 0x3B
169-
#elif CONFIG_SHOLES_OC_SV
169+
#elif defined(CONFIG_SHOLES_OC_SV)
170170
#define SHOLES_VSEL_3 0x38
171171
#define SHOLES_VSEL_4 0x3E
172172
#define SHOLES_VSEL_5 0x3E
173173
#define SHOLES_VSEL_6 0x3E
174174
#define SHOLES_VSEL_7 0x3E
175-
#elif CONFIG_SHOLES_OC_IV
175+
#elif defined(CONFIG_SHOLES_OC_IV)
176176
#define SHOLES_VSEL_3 0x38
177177
#define SHOLES_VSEL_4 0x3E
178178
#define SHOLES_VSEL_5 0x3E
@@ -185,25 +185,25 @@
185185
#define SHOLES_VSEL_6 0x38
186186
#define SHOLES_VSEL_7 0x3B
187187
#endif
188-
#elif CONFIG_SHOLES_MAX_900
188+
#elif defined(CONFIG_SHOLES_OC_MAX_900)
189189
#define SHOLES_FREQ_3 550000000
190190
#define SHOLES_FREQ_4 600000000
191191
#define SHOLES_FREQ_5 700000000
192192
#define SHOLES_FREQ_6 800000000
193193
#define SHOLES_FREQ_7 900000000
194-
#ifdef CONFIG_SHOLES_OC_LV
194+
#if defined(CONFIG_SHOLES_OC_LV)
195195
#define SHOLES_VSEL_3 0x32
196196
#define SHOLES_VSEL_4 0x34
197197
#define SHOLES_VSEL_5 0x38
198198
#define SHOLES_VSEL_6 0x3B
199199
#define SHOLES_VSEL_7 0x3C
200-
#elif CONFIG_SHOLES_OC_SV
200+
#elif defined(CONFIG_SHOLES_OC_SV)
201201
#define SHOLES_VSEL_3 0x38
202202
#define SHOLES_VSEL_4 0x3E
203203
#define SHOLES_VSEL_5 0x3E
204204
#define SHOLES_VSEL_6 0x3E
205205
#define SHOLES_VSEL_7 0x3F
206-
#elif CONFIG_SHOLES_OC_IV
206+
#elif defined(CONFIG_SHOLES_OC_IV)
207207
#define SHOLES_VSEL_3 0x38
208208
#define SHOLES_VSEL_4 0x3E
209209
#define SHOLES_VSEL_5 0x3E
@@ -216,25 +216,25 @@
216216
#define SHOLES_VSEL_6 0x3B
217217
#define SHOLES_VSEL_7 0x3C
218218
#endif
219-
#elif CONFIG_SHOLES_MAX_1000
219+
#elif defined(CONFIG_SHOLES_OC_MAX_1000)
220220
#define SHOLES_FREQ_3 550000000
221221
#define SHOLES_FREQ_4 600000000
222222
#define SHOLES_FREQ_5 800000000
223223
#define SHOLES_FREQ_6 900000000
224224
#define SHOLES_FREQ_7 1000000000
225-
#ifdef CONFIG_SHOLES_OC_LV
225+
#if defined(CONFIG_SHOLES_OC_LV)
226226
#define SHOLES_VSEL_3 0x32
227227
#define SHOLES_VSEL_4 0x34
228228
#define SHOLES_VSEL_5 0x3B
229229
#define SHOLES_VSEL_6 0x3C
230230
#define SHOLES_VSEL_7 0x3E
231-
#elif CONFIG_SHOLES_OC_SV
231+
#elif defined(CONFIG_SHOLES_OC_SV)
232232
#define SHOLES_VSEL_3 0x38
233233
#define SHOLES_VSEL_4 0x3E
234234
#define SHOLES_VSEL_5 0x3E
235235
#define SHOLES_VSEL_6 0x3F
236236
#define SHOLES_VSEL_7 0x3F
237-
#elif CONFIG_SHOLES_OC_IV
237+
#elif defined(CONFIG_SHOLES_OC_IV)
238238
#define SHOLES_VSEL_3 0x38
239239
#define SHOLES_VSEL_4 0x3E
240240
#define SHOLES_VSEL_5 0x4A
@@ -247,25 +247,25 @@
247247
#define SHOLES_VSEL_6 0x3C
248248
#define SHOLES_VSEL_7 0x3E
249249
#endif
250-
#elif CONFIG_SHOLES_MAX_1100
250+
#elif defined(CONFIG_SHOLES_OC_MAX_1100)
251251
#define SHOLES_FREQ_3 550000000
252252
#define SHOLES_FREQ_4 600000000
253253
#define SHOLES_FREQ_5 800000000
254254
#define SHOLES_FREQ_6 1000000000
255255
#define SHOLES_FREQ_7 1100000000
256-
#ifdef CONFIG_SHOLES_OC_LV
256+
#if defined(CONFIG_SHOLES_OC_LV)
257257
#define SHOLES_VSEL_3 0x32
258258
#define SHOLES_VSEL_4 0x34
259259
#define SHOLES_VSEL_5 0x3B
260260
#define SHOLES_VSEL_6 0x3E
261261
#define SHOLES_VSEL_7 0x44
262-
#elif CONFIG_SHOLES_OC_SV
262+
#elif defined(CONFIG_SHOLES_OC_SV)
263263
#define SHOLES_VSEL_3 0x38
264264
#define SHOLES_VSEL_4 0x3E
265265
#define SHOLES_VSEL_5 0x3E
266266
#define SHOLES_VSEL_6 0x3F
267267
#define SHOLES_VSEL_7 0x50
268-
#elif CONFIG_SHOLES_OC_IV
268+
#elif defined(CONFIG_SHOLES_OC_IV)
269269
#define SHOLES_VSEL_3 0x38
270270
#define SHOLES_VSEL_4 0x3E
271271
#define SHOLES_VSEL_5 0x4A
@@ -278,25 +278,25 @@
278278
#define SHOLES_VSEL_6 0x3E
279279
#define SHOLES_VSEL_7 0x44
280280
#endif
281-
#elif CONFIG_SHOLES_MAX_1200
281+
#elif defined(CONFIG_SHOLES_OC_MAX_1200)
282282
#define SHOLES_FREQ_3 550000000
283283
#define SHOLES_FREQ_4 600000000
284284
#define SHOLES_FREQ_5 800000000
285285
#define SHOLES_FREQ_6 1000000000
286286
#define SHOLES_FREQ_7 1200000000
287-
#ifdef CONFIG_SHOLES_OC_LV
287+
#if defined(CONFIG_SHOLES_OC_LV)
288288
#define SHOLES_VSEL_3 0x32
289289
#define SHOLES_VSEL_4 0x34
290290
#define SHOLES_VSEL_5 0x3B
291291
#define SHOLES_VSEL_6 0x3E
292292
#define SHOLES_VSEL_7 0x52
293-
#elif CONFIG_SHOLES_OC_SV
293+
#elif defined(CONFIG_SHOLES_OC_SV)
294294
#define SHOLES_VSEL_3 0x38
295295
#define SHOLES_VSEL_4 0x3E
296296
#define SHOLES_VSEL_5 0x3E
297297
#define SHOLES_VSEL_6 0x3F
298298
#define SHOLES_VSEL_7 0x62
299-
#elif CONFIG_SHOLES_OC_IV
299+
#elif defined(CONFIG_SHOLES_OC_IV)
300300
#define SHOLES_VSEL_3 0x38
301301
#define SHOLES_VSEL_4 0x3E
302302
#define SHOLES_VSEL_5 0x4A
@@ -309,25 +309,25 @@
309309
#define SHOLES_VSEL_6 0x3E
310310
#define SHOLES_VSEL_7 0x52
311311
#endif
312-
#elif CONFIG_SHOLES_MAX_1250
312+
#elif defined(CONFIG_SHOLES_OC_MAX_1250)
313313
#define SHOLES_FREQ_3 550000000
314314
#define SHOLES_FREQ_4 700000000
315315
#define SHOLES_FREQ_5 900000000
316316
#define SHOLES_FREQ_6 1100000000
317317
#define SHOLES_FREQ_7 1250000000
318-
#ifdef CONFIG_SHOLES_OC_LV
318+
#if defined(CONFIG_SHOLES_OC_LV)
319319
#define SHOLES_VSEL_3 0x32
320320
#define SHOLES_VSEL_4 0x38
321321
#define SHOLES_VSEL_5 0x3C
322322
#define SHOLES_VSEL_6 0x44
323323
#define SHOLES_VSEL_7 0x58
324-
#elif CONFIG_SHOLES_OC_SV
324+
#elif defined(CONFIG_SHOLES_OC_SV)
325325
#define SHOLES_VSEL_3 0x38
326326
#define SHOLES_VSEL_4 0x3E
327327
#define SHOLES_VSEL_5 0x3F
328328
#define SHOLES_VSEL_6 0x50
329329
#define SHOLES_VSEL_7 0x62
330-
#elif CONFIG_SHOLES_OC_IV
330+
#elif defined(CONFIG_SHOLES_OC_IV)
331331
#define SHOLES_VSEL_3 0x38
332332
#define SHOLES_VSEL_4 0x3E
333333
#define SHOLES_VSEL_5 0x4A
@@ -340,25 +340,25 @@
340340
#define SHOLES_VSEL_6 0x44
341341
#define SHOLES_VSEL_7 0x58
342342
#endif
343-
#elif CONFIG_SHOLES_MAX_1300
343+
#elif defined(CONFIG_SHOLES_OC_MAX_1300)
344344
#define SHOLES_FREQ_3 600000000
345345
#define SHOLES_FREQ_4 800000000
346346
#define SHOLES_FREQ_5 1000000000
347347
#define SHOLES_FREQ_6 1100000000
348348
#define SHOLES_FREQ_7 1300000000
349-
#ifdef CONFIG_SHOLES_OC_LV
349+
#if defined(CONFIG_SHOLES_OC_LV)
350350
#define SHOLES_VSEL_3 0x34
351351
#define SHOLES_VSEL_4 0x3B
352352
#define SHOLES_VSEL_5 0x3E
353353
#define SHOLES_VSEL_6 0x44
354354
#define SHOLES_VSEL_7 0x60
355-
#elif CONFIG_SHOLES_OC_SV
355+
#elif defined(CONFIG_SHOLES_OC_SV)
356356
#define SHOLES_VSEL_3 0x3E
357357
#define SHOLES_VSEL_4 0x3E
358358
#define SHOLES_VSEL_5 0x3F
359359
#define SHOLES_VSEL_6 0x50
360360
#define SHOLES_VSEL_7 0x62
361-
#elif CONFIG_SHOLES_OC_IV
361+
#elif defined(CONFIG_SHOLES_OC_IV)
362362
#define SHOLES_VSEL_3 0x3E
363363
#define SHOLES_VSEL_4 0x4A
364364
#define SHOLES_VSEL_5 0x50
@@ -377,19 +377,19 @@
377377
#define SHOLES_FREQ_5 800000000
378378
#define SHOLES_FREQ_6 900000000
379379
#define SHOLES_FREQ_7 1000000000
380-
#ifdef CONFIG_SHOLES_OC_LV
380+
#if defined(CONFIG_SHOLES_OC_LV)
381381
#define SHOLES_VSEL_3 0x32
382382
#define SHOLES_VSEL_4 0x34
383383
#define SHOLES_VSEL_5 0x3B
384384
#define SHOLES_VSEL_6 0x3C
385385
#define SHOLES_VSEL_7 0x3E
386-
#elif CONFIG_SHOLES_OC_SV
386+
#elif defined(CONFIG_SHOLES_OC_SV)
387387
#define SHOLES_VSEL_3 0x38
388388
#define SHOLES_VSEL_4 0x3E
389389
#define SHOLES_VSEL_5 0x3E
390390
#define SHOLES_VSEL_6 0x3F
391391
#define SHOLES_VSEL_7 0x3F
392-
#elif CONFIG_SHOLES_OC_IV
392+
#elif defined(CONFIG_SHOLES_OC_IV)
393393
#define SHOLES_VSEL_3 0x38
394394
#define SHOLES_VSEL_4 0x3E
395395
#define SHOLES_VSEL_5 0x4A

0 commit comments

Comments
 (0)