Skip to content

Commit

Permalink
regulator: da903x: Fix list voltage for da9030 ldo14
Browse files Browse the repository at this point in the history
da903x_list_voltage does not return correct voltage for da9030 ldo14.
Implement da9030_list_ldo14_voltage to return correct voltage for da9030 ldo14.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
  • Loading branch information
Axel Lin authored and Mark Brown committed May 12, 2012
1 parent 5ceba7b commit d4eb56a
Showing 1 changed file with 19 additions and 1 deletion.
20 changes: 19 additions & 1 deletion drivers/regulator/da903x.c
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,24 @@ static int da9030_get_ldo14_voltage(struct regulator_dev *rdev)
info->step_uV * (val & ~0x4);
}

static int da9030_list_ldo14_voltage(struct regulator_dev *rdev,
unsigned selector)
{
struct da903x_regulator_info *info = rdev_get_drvdata(rdev);
int volt;

if (selector & 0x4)
volt = info->min_uV + info->step_uV * (3 - (selector & ~0x4));
else
volt = (info->max_uV + info->min_uV) / 2 +
info->step_uV * (selector & ~0x4);

if (volt > info->max_uV)
return -EINVAL;

return volt;
}

/* DA9034 specific operations */
static int da9034_set_dvc_voltage(struct regulator_dev *rdev,
int min_uV, int max_uV, unsigned *selector)
Expand Down Expand Up @@ -357,7 +375,7 @@ static struct regulator_ops da903x_regulator_ldo_ops = {
static struct regulator_ops da9030_regulator_ldo14_ops = {
.set_voltage = da9030_set_ldo14_voltage,
.get_voltage = da9030_get_ldo14_voltage,
.list_voltage = da903x_list_voltage,
.list_voltage = da9030_list_ldo14_voltage,
.enable = da903x_enable,
.disable = da903x_disable,
.is_enabled = da903x_is_enabled,
Expand Down

0 comments on commit d4eb56a

Please sign in to comment.