aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/regulator/wm8994-regulator.c
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2012-05-23 10:40:58 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-06-03 08:25:05 -0400
commitf2d103add158af4c95223a1b576cc0cc6a41a18b (patch)
tree251fc6c665b88aa8fdcffd8ad30eba28b304f99f /drivers/regulator/wm8994-regulator.c
parent0713e6abf398327b6813398d3583e0907953e457 (diff)
regulator: wm8994: Convert wm8994_ldo1_ops to regulator_[list|map]_voltage_linear
Signed-off-by: Axel Lin <axel.lin@gmail.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers/regulator/wm8994-regulator.c')
-rw-r--r--drivers/regulator/wm8994-regulator.c14
1 files changed, 4 insertions, 10 deletions
diff --git a/drivers/regulator/wm8994-regulator.c b/drivers/regulator/wm8994-regulator.c
index 9a994316e63c..0e2028b74d1a 100644
--- a/drivers/regulator/wm8994-regulator.c
+++ b/drivers/regulator/wm8994-regulator.c
@@ -77,22 +77,14 @@ static int wm8994_ldo_enable_time(struct regulator_dev *rdev)
77 return 3000; 77 return 3000;
78} 78}
79 79
80static int wm8994_ldo1_list_voltage(struct regulator_dev *rdev,
81 unsigned int selector)
82{
83 if (selector > WM8994_LDO1_MAX_SELECTOR)
84 return -EINVAL;
85
86 return (selector * 100000) + 2400000;
87}
88
89static struct regulator_ops wm8994_ldo1_ops = { 80static struct regulator_ops wm8994_ldo1_ops = {
90 .enable = wm8994_ldo_enable, 81 .enable = wm8994_ldo_enable,
91 .disable = wm8994_ldo_disable, 82 .disable = wm8994_ldo_disable,
92 .is_enabled = wm8994_ldo_is_enabled, 83 .is_enabled = wm8994_ldo_is_enabled,
93 .enable_time = wm8994_ldo_enable_time, 84 .enable_time = wm8994_ldo_enable_time,
94 85
95 .list_voltage = wm8994_ldo1_list_voltage, 86 .list_voltage = regulator_list_voltage_linear,
87 .map_voltage = regulator_map_voltage_linear,
96 .get_voltage_sel = regulator_get_voltage_sel_regmap, 88 .get_voltage_sel = regulator_get_voltage_sel_regmap,
97 .set_voltage_sel = regulator_set_voltage_sel_regmap, 89 .set_voltage_sel = regulator_set_voltage_sel_regmap,
98}; 90};
@@ -143,6 +135,8 @@ static const struct regulator_desc wm8994_ldo_desc[] = {
143 .vsel_reg = WM8994_LDO_1, 135 .vsel_reg = WM8994_LDO_1,
144 .vsel_mask = WM8994_LDO1_VSEL_MASK, 136 .vsel_mask = WM8994_LDO1_VSEL_MASK,
145 .ops = &wm8994_ldo1_ops, 137 .ops = &wm8994_ldo1_ops,
138 .min_uV = 2400000,
139 .uV_step = 100000,
146 .owner = THIS_MODULE, 140 .owner = THIS_MODULE,
147 }, 141 },
148 { 142 {