Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6:
regulator: tps6586x: correct register table
regulator: tps6586x: Handle both enable reg/bits being the same
regulator: tps6586x: Fix TPS6586X_DVM to store goreg/bit
regulator: tps6586x: Add missing bit mask generation
+22
-11
+22
-11
drivers/regulator/tps6586x-regulator.c
+22
-11
drivers/regulator/tps6586x-regulator.c
···
231
231
};
232
232
233
233
#define TPS6586X_REGULATOR(_id, vdata, _ops, vreg, shift, nbits, \
234
-
ereg0, ebit0, ereg1, ebit1, goreg, gobit) \
235
-
{ \
234
+
ereg0, ebit0, ereg1, ebit1) \
236
235
.desc = { \
237
236
.name = "REG-" #_id, \
238
237
.ops = &tps6586x_regulator_##_ops, \
···
247
248
.enable_bit[0] = (ebit0), \
248
249
.enable_reg[1] = TPS6586X_SUPPLY##ereg1, \
249
250
.enable_bit[1] = (ebit1), \
250
-
.voltages = tps6586x_##vdata##_voltages, \
251
-
}
251
+
.voltages = tps6586x_##vdata##_voltages,
252
+
253
+
#define TPS6586X_REGULATOR_DVM_GOREG(goreg, gobit) \
254
+
.go_reg = TPS6586X_##goreg, \
255
+
.go_bit = (gobit),
252
256
253
257
#define TPS6586X_LDO(_id, vdata, vreg, shift, nbits, \
254
258
ereg0, ebit0, ereg1, ebit1) \
259
+
{ \
255
260
TPS6586X_REGULATOR(_id, vdata, ldo_ops, vreg, shift, nbits, \
256
-
ereg0, ebit0, ereg1, ebit1, 0, 0)
261
+
ereg0, ebit0, ereg1, ebit1) \
262
+
}
257
263
258
264
#define TPS6586X_DVM(_id, vdata, vreg, shift, nbits, \
259
265
ereg0, ebit0, ereg1, ebit1, goreg, gobit) \
266
+
{ \
260
267
TPS6586X_REGULATOR(_id, vdata, dvm_ops, vreg, shift, nbits, \
261
-
ereg0, ebit0, ereg1, ebit1, goreg, gobit)
268
+
ereg0, ebit0, ereg1, ebit1) \
269
+
TPS6586X_REGULATOR_DVM_GOREG(goreg, gobit) \
270
+
}
262
271
263
272
static struct tps6586x_regulator tps6586x_regulator[] = {
264
273
TPS6586X_LDO(LDO_0, ldo, SUPPLYV1, 5, 3, ENC, 0, END, 0),
···
274
267
TPS6586X_LDO(LDO_5, ldo, SUPPLYV6, 0, 3, ENE, 6, ENE, 6),
275
268
TPS6586X_LDO(LDO_6, ldo, SUPPLYV3, 0, 3, ENC, 4, END, 4),
276
269
TPS6586X_LDO(LDO_7, ldo, SUPPLYV3, 3, 3, ENC, 5, END, 5),
277
-
TPS6586X_LDO(LDO_8, ldo, SUPPLYV1, 5, 3, ENC, 6, END, 6),
270
+
TPS6586X_LDO(LDO_8, ldo, SUPPLYV2, 5, 3, ENC, 6, END, 6),
278
271
TPS6586X_LDO(LDO_9, ldo, SUPPLYV6, 3, 3, ENE, 7, ENE, 7),
279
-
TPS6586X_LDO(LDO_RTC, ldo, SUPPLYV4, 3, 3, ENE, 7, ENE, 7),
272
+
TPS6586X_LDO(LDO_RTC, ldo, SUPPLYV4, 3, 3, V4, 7, V4, 7),
280
273
TPS6586X_LDO(LDO_1, dvm, SUPPLYV1, 0, 5, ENC, 1, END, 1),
281
-
TPS6586X_LDO(SM_2, sm2, SUPPLYV2, 0, 5, ENC, 1, END, 1),
274
+
TPS6586X_LDO(SM_2, sm2, SUPPLYV2, 0, 5, ENC, 7, END, 7),
282
275
283
276
TPS6586X_DVM(LDO_2, dvm, LDO2BV1, 0, 5, ENA, 3, ENB, 3, VCC2, 6),
284
277
TPS6586X_DVM(LDO_4, ldo4, LDO4V1, 0, 5, ENC, 3, END, 3, VCC1, 6),
···
297
290
uint8_t val1, val2;
298
291
int ret;
299
292
293
+
if (ri->enable_reg[0] == ri->enable_reg[1] &&
294
+
ri->enable_bit[0] == ri->enable_bit[1])
295
+
return 0;
296
+
300
297
ret = tps6586x_read(parent, ri->enable_reg[0], &val1);
301
298
if (ret)
302
299
return ret;
···
309
298
if (ret)
310
299
return ret;
311
300
312
-
if (!(val2 & ri->enable_bit[1]))
301
+
if (!(val2 & (1 << ri->enable_bit[1])))
313
302
return 0;
314
303
315
304
/*
316
305
* The regulator is on, but it's enabled with the bit we don't
317
306
* want to use, so we switch the enable bits
318
307
*/
319
-
if (!(val1 & ri->enable_bit[0])) {
308
+
if (!(val1 & (1 << ri->enable_bit[0]))) {
320
309
ret = tps6586x_set_bits(parent, ri->enable_reg[0],
321
310
1 << ri->enable_bit[0]);
322
311
if (ret)