summaryrefslogtreecommitdiffstats
path: root/drivers/regulator
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2012-03-12 15:59:54 +0800
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-03-14 14:13:17 +0000
commitca61a7bfcd1c68eba84a58070540684448216506 (patch)
tree3b671e8c48ba0971be77c33024a84f59a5a34e91 /drivers/regulator
parentf2933d333118bff82e4b46fff605e31f799df5ce (diff)
downloadop-kernel-dev-ca61a7bfcd1c68eba84a58070540684448216506.zip
op-kernel-dev-ca61a7bfcd1c68eba84a58070540684448216506.tar.gz
regulator: Convert tps6507x to set_voltage_sel
Signed-off-by: Axel Lin <axel.lin@gmail.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers/regulator')
-rw-r--r--drivers/regulator/tps6507x-regulator.c31
1 files changed, 5 insertions, 26 deletions
diff --git a/drivers/regulator/tps6507x-regulator.c b/drivers/regulator/tps6507x-regulator.c
index e140a15..832833f 100644
--- a/drivers/regulator/tps6507x-regulator.c
+++ b/drivers/regulator/tps6507x-regulator.c
@@ -328,12 +328,11 @@ static int tps6507x_pmic_get_voltage(struct regulator_dev *dev)
return tps->info[rid]->table[data] * 1000;
}
-static int tps6507x_pmic_set_voltage(struct regulator_dev *dev,
- int min_uV, int max_uV,
- unsigned *selector)
+static int tps6507x_pmic_set_voltage_sel(struct regulator_dev *dev,
+ unsigned selector)
{
struct tps6507x_pmic *tps = rdev_get_drvdata(dev);
- int data, vsel, rid = rdev_get_id(dev);
+ int data, rid = rdev_get_id(dev);
u8 reg, mask;
switch (rid) {
@@ -367,32 +366,12 @@ static int tps6507x_pmic_set_voltage(struct regulator_dev *dev,
return -EINVAL;
}
- if (min_uV < tps->info[rid]->min_uV || min_uV > tps->info[rid]->max_uV)
- return -EINVAL;
- if (max_uV < tps->info[rid]->min_uV || max_uV > tps->info[rid]->max_uV)
- return -EINVAL;
-
- for (vsel = 0; vsel < tps->info[rid]->table_len; vsel++) {
- int mV = tps->info[rid]->table[vsel];
- int uV = mV * 1000;
-
- /* Break at the first in-range value */
- if (min_uV <= uV && uV <= max_uV)
- break;
- }
-
- /* write to the register in case we found a match */
- if (vsel == tps->info[rid]->table_len)
- return -EINVAL;
-
- *selector = vsel;
-
data = tps6507x_pmic_reg_read(tps, reg);
if (data < 0)
return data;
data &= ~mask;
- data |= vsel;
+ data |= selector;
return tps6507x_pmic_reg_write(tps, reg, data);
}
@@ -417,7 +396,7 @@ static struct regulator_ops tps6507x_pmic_ops = {
.enable = tps6507x_pmic_enable,
.disable = tps6507x_pmic_disable,
.get_voltage = tps6507x_pmic_get_voltage,
- .set_voltage = tps6507x_pmic_set_voltage,
+ .set_voltage_sel = tps6507x_pmic_set_voltage_sel,
.list_voltage = tps6507x_pmic_list_voltage,
};
OpenPOWER on IntegriCloud