@@ -66,7 +66,7 @@ struct da9063_regulator_data {
66
66
};
67
67
68
68
struct da9063_regulators_pdata {
69
- unsigned n_regulators ;
69
+ unsigned int n_regulators ;
70
70
struct da9063_regulator_data * regulator_data ;
71
71
};
72
72
@@ -131,7 +131,7 @@ struct da9063_regulator_info {
131
131
/* Defines asignment of regulators info table to chip model */
132
132
struct da9063_dev_model {
133
133
const struct da9063_regulator_info * regulator_info ;
134
- unsigned n_regulators ;
134
+ unsigned int n_regulators ;
135
135
enum da9063_type type ;
136
136
};
137
137
@@ -150,7 +150,7 @@ struct da9063_regulator {
150
150
151
151
/* Encapsulates all information for the regulators driver */
152
152
struct da9063_regulators {
153
- unsigned n_regulators ;
153
+ unsigned int n_regulators ;
154
154
/* Array size to be defined during init. Keep at end. */
155
155
struct da9063_regulator regulator [0 ];
156
156
};
@@ -165,38 +165,46 @@ enum {
165
165
166
166
/* Regulator operations */
167
167
168
- /* Current limits array (in uA) for BCORE1, BCORE2, BPRO.
169
- Entry indexes corresponds to register values. */
168
+ /*
169
+ * Current limits array (in uA) for BCORE1, BCORE2, BPRO.
170
+ * Entry indexes corresponds to register values.
171
+ */
170
172
static const unsigned int da9063_buck_a_limits [] = {
171
173
500000 , 600000 , 700000 , 800000 , 900000 , 1000000 , 1100000 , 1200000 ,
172
174
1300000 , 1400000 , 1500000 , 1600000 , 1700000 , 1800000 , 1900000 , 2000000
173
175
};
174
176
175
- /* Current limits array (in uA) for BMEM, BIO, BPERI.
176
- Entry indexes corresponds to register values. */
177
+ /*
178
+ * Current limits array (in uA) for BMEM, BIO, BPERI.
179
+ * Entry indexes corresponds to register values.
180
+ */
177
181
static const unsigned int da9063_buck_b_limits [] = {
178
182
1500000 , 1600000 , 1700000 , 1800000 , 1900000 , 2000000 , 2100000 , 2200000 ,
179
183
2300000 , 2400000 , 2500000 , 2600000 , 2700000 , 2800000 , 2900000 , 3000000
180
184
};
181
185
182
- /* Current limits array (in uA) for merged BCORE1 and BCORE2.
183
- Entry indexes corresponds to register values. */
186
+ /*
187
+ * Current limits array (in uA) for merged BCORE1 and BCORE2.
188
+ * Entry indexes corresponds to register values.
189
+ */
184
190
static const unsigned int da9063_bcores_merged_limits [] = {
185
191
1000000 , 1200000 , 1400000 , 1600000 , 1800000 , 2000000 , 2200000 , 2400000 ,
186
192
2600000 , 2800000 , 3000000 , 3200000 , 3400000 , 3600000 , 3800000 , 4000000
187
193
};
188
194
189
- /* Current limits array (in uA) for merged BMEM and BIO.
190
- Entry indexes corresponds to register values. */
195
+ /*
196
+ * Current limits array (in uA) for merged BMEM and BIO.
197
+ * Entry indexes corresponds to register values.
198
+ */
191
199
static const unsigned int da9063_bmem_bio_merged_limits [] = {
192
200
3000000 , 3200000 , 3400000 , 3600000 , 3800000 , 4000000 , 4200000 , 4400000 ,
193
201
4600000 , 4800000 , 5000000 , 5200000 , 5400000 , 5600000 , 5800000 , 6000000
194
202
};
195
203
196
- static int da9063_buck_set_mode (struct regulator_dev * rdev , unsigned mode )
204
+ static int da9063_buck_set_mode (struct regulator_dev * rdev , unsigned int mode )
197
205
{
198
206
struct da9063_regulator * regl = rdev_get_drvdata (rdev );
199
- unsigned val ;
207
+ unsigned int val ;
200
208
201
209
switch (mode ) {
202
210
case REGULATOR_MODE_FAST :
@@ -221,7 +229,7 @@ static int da9063_buck_set_mode(struct regulator_dev *rdev, unsigned mode)
221
229
* There are 3 modes to map to: FAST, NORMAL, and STANDBY.
222
230
*/
223
231
224
- static unsigned da9063_buck_get_mode (struct regulator_dev * rdev )
232
+ static unsigned int da9063_buck_get_mode (struct regulator_dev * rdev )
225
233
{
226
234
struct da9063_regulator * regl = rdev_get_drvdata (rdev );
227
235
struct regmap_field * field ;
@@ -271,10 +279,10 @@ static unsigned da9063_buck_get_mode(struct regulator_dev *rdev)
271
279
* There are 2 modes to map to: NORMAL and STANDBY (sleep) for each state.
272
280
*/
273
281
274
- static int da9063_ldo_set_mode (struct regulator_dev * rdev , unsigned mode )
282
+ static int da9063_ldo_set_mode (struct regulator_dev * rdev , unsigned int mode )
275
283
{
276
284
struct da9063_regulator * regl = rdev_get_drvdata (rdev );
277
- unsigned val ;
285
+ unsigned int val ;
278
286
279
287
switch (mode ) {
280
288
case REGULATOR_MODE_NORMAL :
@@ -290,7 +298,7 @@ static int da9063_ldo_set_mode(struct regulator_dev *rdev, unsigned mode)
290
298
return regmap_field_write (regl -> sleep , val );
291
299
}
292
300
293
- static unsigned da9063_ldo_get_mode (struct regulator_dev * rdev )
301
+ static unsigned int da9063_ldo_get_mode (struct regulator_dev * rdev )
294
302
{
295
303
struct da9063_regulator * regl = rdev_get_drvdata (rdev );
296
304
struct regmap_field * field ;
@@ -383,7 +391,8 @@ static int da9063_suspend_disable(struct regulator_dev *rdev)
383
391
return regmap_field_write (regl -> suspend , 0 );
384
392
}
385
393
386
- static int da9063_buck_set_suspend_mode (struct regulator_dev * rdev , unsigned mode )
394
+ static int da9063_buck_set_suspend_mode (struct regulator_dev * rdev ,
395
+ unsigned int mode )
387
396
{
388
397
struct da9063_regulator * regl = rdev_get_drvdata (rdev );
389
398
int val ;
@@ -405,10 +414,11 @@ static int da9063_buck_set_suspend_mode(struct regulator_dev *rdev, unsigned mod
405
414
return regmap_field_write (regl -> mode , val );
406
415
}
407
416
408
- static int da9063_ldo_set_suspend_mode (struct regulator_dev * rdev , unsigned mode )
417
+ static int da9063_ldo_set_suspend_mode (struct regulator_dev * rdev ,
418
+ unsigned int mode )
409
419
{
410
420
struct da9063_regulator * regl = rdev_get_drvdata (rdev );
411
- unsigned val ;
421
+ unsigned int val ;
412
422
413
423
switch (mode ) {
414
424
case REGULATOR_MODE_NORMAL :
@@ -593,7 +603,7 @@ static irqreturn_t da9063_ldo_lim_event(int irq, void *data)
593
603
struct da9063_regulators * regulators = data ;
594
604
struct da9063 * hw = regulators -> regulator [0 ].hw ;
595
605
struct da9063_regulator * regl ;
596
- int bits , i , ret ;
606
+ int bits , i , ret ;
597
607
598
608
ret = regmap_read (hw -> regmap , DA9063_REG_STATUS_D , & bits );
599
609
if (ret < 0 )
@@ -605,10 +615,10 @@ static irqreturn_t da9063_ldo_lim_event(int irq, void *data)
605
615
continue ;
606
616
607
617
if (BIT (regl -> info -> oc_event .lsb ) & bits ) {
608
- regulator_lock (regl -> rdev );
618
+ regulator_lock (regl -> rdev );
609
619
regulator_notifier_call_chain (regl -> rdev ,
610
620
REGULATOR_EVENT_OVER_CURRENT , NULL );
611
- regulator_unlock (regl -> rdev );
621
+ regulator_unlock (regl -> rdev );
612
622
}
613
623
}
614
624
@@ -833,7 +843,7 @@ static int da9063_regulator_probe(struct platform_device *pdev)
833
843
834
844
if (regl -> info -> suspend_sleep .reg ) {
835
845
regl -> suspend_sleep = devm_regmap_field_alloc (& pdev -> dev ,
836
- da9063 -> regmap , regl -> info -> suspend_sleep );
846
+ da9063 -> regmap , regl -> info -> suspend_sleep );
837
847
if (IS_ERR (regl -> suspend_sleep ))
838
848
return PTR_ERR (regl -> suspend_sleep );
839
849
}
0 commit comments