aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/regulator
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2012-05-13 22:36:40 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-05-14 06:00:40 -0400
commitcd8318cb9e8dea0dcf8ccb15955b48d14ba51e52 (patch)
tree0effc4e6a9c0a491fece2a6c2b3a706584705b3c /drivers/regulator
parent4093e739f76e1a17b748f9558e3a48a49507885a (diff)
regulator: max8925: Convert to set_voltage_sel() and map_voltage()
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/max8925-regulator.c23
1 files changed, 8 insertions, 15 deletions
diff --git a/drivers/regulator/max8925-regulator.c b/drivers/regulator/max8925-regulator.c
index 7dbae399ebcf..0ffcb5555285 100644
--- a/drivers/regulator/max8925-regulator.c
+++ b/drivers/regulator/max8925-regulator.c
@@ -52,22 +52,13 @@ static inline int check_range(struct max8925_regulator_info *info,
52 return 0; 52 return 0;
53} 53}
54 54
55static int max8925_set_voltage(struct regulator_dev *rdev, 55static int max8925_set_voltage_sel(struct regulator_dev *rdev,
56 int min_uV, int max_uV, unsigned int *selector) 56 unsigned int selector)
57{ 57{
58 struct max8925_regulator_info *info = rdev_get_drvdata(rdev); 58 struct max8925_regulator_info *info = rdev_get_drvdata(rdev);
59 unsigned char data, mask; 59 unsigned char mask = rdev->desc->n_voltages - 1;
60
61 if (check_range(info, min_uV, max_uV)) {
62 dev_err(info->chip->dev, "invalid voltage range (%d, %d) uV\n",
63 min_uV, max_uV);
64 return -EINVAL;
65 }
66 data = DIV_ROUND_UP(min_uV - info->desc.min_uV, info->desc.uV_step);
67 *selector = data;
68 mask = rdev->desc->n_voltages - 1;
69 60
70 return max8925_set_bits(info->i2c, info->vol_reg, mask, data); 61 return max8925_set_bits(info->i2c, info->vol_reg, mask, selector);
71} 62}
72 63
73static int max8925_get_voltage_sel(struct regulator_dev *rdev) 64static int max8925_get_voltage_sel(struct regulator_dev *rdev)
@@ -152,8 +143,9 @@ static int max8925_set_dvm_disable(struct regulator_dev *rdev)
152} 143}
153 144
154static struct regulator_ops max8925_regulator_sdv_ops = { 145static struct regulator_ops max8925_regulator_sdv_ops = {
146 .map_voltage = regulator_map_voltage_linear,
155 .list_voltage = regulator_list_voltage_linear, 147 .list_voltage = regulator_list_voltage_linear,
156 .set_voltage = max8925_set_voltage, 148 .set_voltage_sel = max8925_set_voltage_sel,
157 .get_voltage_sel = max8925_get_voltage_sel, 149 .get_voltage_sel = max8925_get_voltage_sel,
158 .enable = max8925_enable, 150 .enable = max8925_enable,
159 .disable = max8925_disable, 151 .disable = max8925_disable,
@@ -164,8 +156,9 @@ static struct regulator_ops max8925_regulator_sdv_ops = {
164}; 156};
165 157
166static struct regulator_ops max8925_regulator_ldo_ops = { 158static struct regulator_ops max8925_regulator_ldo_ops = {
159 .map_voltage = regulator_map_voltage_linear,
167 .list_voltage = regulator_list_voltage_linear, 160 .list_voltage = regulator_list_voltage_linear,
168 .set_voltage = max8925_set_voltage, 161 .set_voltage_sel = max8925_set_voltage_sel,
169 .get_voltage_sel = max8925_get_voltage_sel, 162 .get_voltage_sel = max8925_get_voltage_sel,
170 .enable = max8925_enable, 163 .enable = max8925_enable,
171 .disable = max8925_disable, 164 .disable = max8925_disable,