summaryrefslogtreecommitdiffstats
path: root/drivers/regulator/tps80031-regulator.c
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2012-12-06 01:24:11 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-12-07 07:24:12 +0100
commit7fa8a5975784cce646b3763e5d9957f8d688c9ce (patch)
tree9186d23e64b8c5130c611e95d17afb5966f69a0a /drivers/regulator/tps80031-regulator.c
parentregulator: tps80031: Implement list_voltage and set n_voltages = 1 for fixed ... (diff)
downloadlinux-7fa8a5975784cce646b3763e5d9957f8d688c9ce.tar.xz
linux-7fa8a5975784cce646b3763e5d9957f8d688c9ce.zip
regulator: tps80031: Convert tps80031_ldo_ops to linear_min_sel and list_voltage_linear
Signed-off-by: Axel Lin <axel.lin@ingics.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers/regulator/tps80031-regulator.c')
-rw-r--r--drivers/regulator/tps80031-regulator.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/regulator/tps80031-regulator.c b/drivers/regulator/tps80031-regulator.c
index ce480499177e..b54300c64424 100644
--- a/drivers/regulator/tps80031-regulator.c
+++ b/drivers/regulator/tps80031-regulator.c
@@ -284,14 +284,6 @@ static int tps80031_ldo_get_voltage_sel(struct regulator_dev *rdev)
return vsel & rdev->desc->vsel_mask;
}
-static int tps80031_ldo_list_voltage(struct regulator_dev *rdev, unsigned sel)
-{
- if (sel == 0)
- return 0;
- else
- return regulator_list_voltage_linear(rdev, sel - 1);
-}
-
static int tps80031_vbus_is_enabled(struct regulator_dev *rdev)
{
struct tps80031_regulator *ri = rdev_get_drvdata(rdev);
@@ -398,7 +390,7 @@ static struct regulator_ops tps80031_dcdc_ops = {
};
static struct regulator_ops tps80031_ldo_ops = {
- .list_voltage = tps80031_ldo_list_voltage,
+ .list_voltage = regulator_list_voltage_linear,
.set_voltage_sel = tps80031_ldo_set_voltage_sel,
.get_voltage_sel = tps80031_ldo_get_voltage_sel,
.enable = tps80031_reg_enable,
@@ -465,6 +457,7 @@ static struct regulator_ops tps80031_ext_reg_ops = {
.type = REGULATOR_VOLTAGE, \
.min_uV = 1000000, \
.uV_step = 100000, \
+ .linear_min_sel = 1, \
.n_voltages = 25, \
.vsel_mask = LDO_VSEL_MASK, \
.enable_time = 500, \