summaryrefslogtreecommitdiff
path: root/drivers/regulator/da903x.c
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2012-05-08 15:46:10 +0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-05-12 14:12:41 +0400
commitd4eb56a16273a04f10eb7f959e1bb59b6f88d8c9 (patch)
treefdcfd0d808c9bb418ad068689cc158209e256fef /drivers/regulator/da903x.c
parent5ceba7bab02df45260452e06f3b9c391ad1d776e (diff)
downloadlinux-d4eb56a16273a04f10eb7f959e1bb59b6f88d8c9.tar.xz
regulator: da903x: Fix list voltage for da9030 ldo14
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>
Diffstat (limited to 'drivers/regulator/da903x.c')
-rw-r--r--drivers/regulator/da903x.c20
1 files changed, 19 insertions, 1 deletions
diff --git a/drivers/regulator/da903x.c b/drivers/regulator/da903x.c
index 682bdb391abd..a9c4590061c1 100644
--- a/drivers/regulator/da903x.c
+++ b/drivers/regulator/da903x.c
@@ -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)
@@ -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,