Skip to content

Commit

Permalink
regulator: Convert twl4030ldo_set_voltage to set_voltage_sel
Browse files Browse the repository at this point in the history
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 Apr 6, 2012
1 parent 4eb0645 commit dd16b1f
Showing 1 changed file with 4 additions and 23 deletions.
27 changes: 4 additions & 23 deletions drivers/regulator/twl-regulator.c
Original file line number Diff line number Diff line change
Expand Up @@ -473,31 +473,12 @@ static int twl4030ldo_list_voltage(struct regulator_dev *rdev, unsigned index)
}

static int
twl4030ldo_set_voltage(struct regulator_dev *rdev, int min_uV, int max_uV,
unsigned *selector)
twl4030ldo_set_voltage_sel(struct regulator_dev *rdev, unsigned selector)
{
struct twlreg_info *info = rdev_get_drvdata(rdev);
int vsel;

for (vsel = 0; vsel < info->table_len; vsel++) {
int mV = info->table[vsel];
int uV;

if (IS_UNSUP(mV))
continue;
uV = LDO_MV(mV) * 1000;

/* REVISIT for VAUX2, first match may not be best/lowest */

/* use the first in-range value */
if (min_uV <= uV && uV <= max_uV) {
*selector = vsel;
return twlreg_write(info, TWL_MODULE_PM_RECEIVER,
VREG_VOLTAGE, vsel);
}
}

return -EDOM;
return twlreg_write(info, TWL_MODULE_PM_RECEIVER, VREG_VOLTAGE,
selector);
}

static int twl4030ldo_get_voltage(struct regulator_dev *rdev)
Expand All @@ -516,7 +497,7 @@ static int twl4030ldo_get_voltage(struct regulator_dev *rdev)
static struct regulator_ops twl4030ldo_ops = {
.list_voltage = twl4030ldo_list_voltage,

.set_voltage = twl4030ldo_set_voltage,
.set_voltage_sel = twl4030ldo_set_voltage_sel,
.get_voltage = twl4030ldo_get_voltage,

.enable = twl4030reg_enable,
Expand Down

0 comments on commit dd16b1f

Please sign in to comment.