diff options
author | Axel Lin <axel.lin@gmail.com> | 2012-03-12 23:22:41 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-04-01 06:59:32 -0400 |
commit | 6f43c3809ec35c04c03f428d8b71121c13d2434e (patch) | |
tree | 18db50749f846763b4ceb6c598328ba30100aad1 /drivers/regulator/max8997.c | |
parent | 6ea67d04b6d4b5e2bf8d276ceb801e03d7f22910 (diff) |
regulator: Make max8997_get_voltage_register always return correct register
Check max8997->buck[1|2|5]_gpiodvs status in max8997_get_voltage_register
and return correct register accordingly.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers/regulator/max8997.c')
-rw-r--r-- | drivers/regulator/max8997.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/regulator/max8997.c b/drivers/regulator/max8997.c index 96579296f04..35e7332fb93 100644 --- a/drivers/regulator/max8997.c +++ b/drivers/regulator/max8997.c | |||
@@ -320,6 +320,7 @@ static int max8997_reg_disable(struct regulator_dev *rdev) | |||
320 | static int max8997_get_voltage_register(struct regulator_dev *rdev, | 320 | static int max8997_get_voltage_register(struct regulator_dev *rdev, |
321 | int *_reg, int *_shift, int *_mask) | 321 | int *_reg, int *_shift, int *_mask) |
322 | { | 322 | { |
323 | struct max8997_data *max8997 = rdev_get_drvdata(rdev); | ||
323 | int rid = rdev_get_id(rdev); | 324 | int rid = rdev_get_id(rdev); |
324 | int reg, shift = 0, mask = 0x3f; | 325 | int reg, shift = 0, mask = 0x3f; |
325 | 326 | ||
@@ -329,9 +330,13 @@ static int max8997_get_voltage_register(struct regulator_dev *rdev, | |||
329 | break; | 330 | break; |
330 | case MAX8997_BUCK1: | 331 | case MAX8997_BUCK1: |
331 | reg = MAX8997_REG_BUCK1DVS1; | 332 | reg = MAX8997_REG_BUCK1DVS1; |
333 | if (max8997->buck1_gpiodvs) | ||
334 | reg += max8997->buck125_gpioindex; | ||
332 | break; | 335 | break; |
333 | case MAX8997_BUCK2: | 336 | case MAX8997_BUCK2: |
334 | reg = MAX8997_REG_BUCK2DVS1; | 337 | reg = MAX8997_REG_BUCK2DVS1; |
338 | if (max8997->buck2_gpiodvs) | ||
339 | reg += max8997->buck125_gpioindex; | ||
335 | break; | 340 | break; |
336 | case MAX8997_BUCK3: | 341 | case MAX8997_BUCK3: |
337 | reg = MAX8997_REG_BUCK3DVS; | 342 | reg = MAX8997_REG_BUCK3DVS; |
@@ -341,6 +346,8 @@ static int max8997_get_voltage_register(struct regulator_dev *rdev, | |||
341 | break; | 346 | break; |
342 | case MAX8997_BUCK5: | 347 | case MAX8997_BUCK5: |
343 | reg = MAX8997_REG_BUCK5DVS1; | 348 | reg = MAX8997_REG_BUCK5DVS1; |
349 | if (max8997->buck5_gpiodvs) | ||
350 | reg += max8997->buck125_gpioindex; | ||
344 | break; | 351 | break; |
345 | case MAX8997_BUCK7: | 352 | case MAX8997_BUCK7: |
346 | reg = MAX8997_REG_BUCK7DVS; | 353 | reg = MAX8997_REG_BUCK7DVS; |
@@ -381,18 +388,12 @@ static int max8997_get_voltage(struct regulator_dev *rdev) | |||
381 | struct max8997_data *max8997 = rdev_get_drvdata(rdev); | 388 | struct max8997_data *max8997 = rdev_get_drvdata(rdev); |
382 | struct i2c_client *i2c = max8997->iodev->i2c; | 389 | struct i2c_client *i2c = max8997->iodev->i2c; |
383 | int reg, shift, mask, ret; | 390 | int reg, shift, mask, ret; |
384 | int rid = rdev_get_id(rdev); | ||
385 | u8 val; | 391 | u8 val; |
386 | 392 | ||
387 | ret = max8997_get_voltage_register(rdev, ®, &shift, &mask); | 393 | ret = max8997_get_voltage_register(rdev, ®, &shift, &mask); |
388 | if (ret) | 394 | if (ret) |
389 | return ret; | 395 | return ret; |
390 | 396 | ||
391 | if ((rid == MAX8997_BUCK1 && max8997->buck1_gpiodvs) || | ||
392 | (rid == MAX8997_BUCK2 && max8997->buck2_gpiodvs) || | ||
393 | (rid == MAX8997_BUCK5 && max8997->buck5_gpiodvs)) | ||
394 | reg += max8997->buck125_gpioindex; | ||
395 | |||
396 | ret = max8997_read_reg(i2c, reg, &val); | 397 | ret = max8997_read_reg(i2c, reg, &val); |
397 | if (ret) | 398 | if (ret) |
398 | return ret; | 399 | return ret; |