aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/regulator/ab8500.c
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2013-03-25 02:59:00 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-03-25 06:19:52 -0400
commit5689e830745b39dbab895e5e8df3f962cb7eecac (patch)
treedff7d280172b92746119adf37e1403f3968b9c4d /drivers/regulator/ab8500.c
parent328a5369664d09e9082a8e814a9b2dcdfb7f519b (diff)
regulator: ab8500: Use regulator_list_voltage_linear for fixed voltage
Both ab8500_regulator_mode_ops and ab8500_regulator_ops do not have volt_table setting, thus we can not use regulator_list_voltage_table for them. However, they have min_uV setting with n_voltages = 1, so use regulator_list_voltage_linear instead. Also remove setting set_voltage_time_sel for ab8500_regulator_mode_ops. It is used only for fixed voltage, so it does not need to implement set_voltage_time_sel. Signed-off-by: Axel Lin <axel.lin@ingics.com> Acked-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers/regulator/ab8500.c')
-rw-r--r--drivers/regulator/ab8500.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c
index a2d19c650f24..12e274039ae1 100644
--- a/drivers/regulator/ab8500.c
+++ b/drivers/regulator/ab8500.c
@@ -363,8 +363,7 @@ static struct regulator_ops ab8500_regulator_mode_ops = {
363 .set_mode = ab8500_regulator_set_mode, 363 .set_mode = ab8500_regulator_set_mode,
364 .get_mode = ab8500_regulator_get_mode, 364 .get_mode = ab8500_regulator_get_mode,
365 .get_voltage_sel = ab8500_regulator_get_voltage_sel, 365 .get_voltage_sel = ab8500_regulator_get_voltage_sel,
366 .list_voltage = regulator_list_voltage_table, 366 .list_voltage = regulator_list_voltage_linear,
367 .set_voltage_time_sel = ab8500_regulator_set_voltage_time_sel,
368}; 367};
369 368
370static struct regulator_ops ab8500_regulator_ops = { 369static struct regulator_ops ab8500_regulator_ops = {
@@ -372,7 +371,7 @@ static struct regulator_ops ab8500_regulator_ops = {
372 .disable = ab8500_regulator_disable, 371 .disable = ab8500_regulator_disable,
373 .is_enabled = ab8500_regulator_is_enabled, 372 .is_enabled = ab8500_regulator_is_enabled,
374 .get_voltage_sel = ab8500_regulator_get_voltage_sel, 373 .get_voltage_sel = ab8500_regulator_get_voltage_sel,
375 .list_voltage = regulator_list_voltage_table, 374 .list_voltage = regulator_list_voltage_linear,
376}; 375};
377 376
378static struct ab8500_regulator_info 377static struct ab8500_regulator_info