evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

regulator: tps6105x: Use regulator_list_voltage_table()

Browse source 
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Axel Lin 2012-05-20 10:37:33 +08:00 • committed by Mark Brown
parent 4f73ccad5c
commit c55979b7bd
1 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/regulator/tps6105x-regulator.c
View file

@ -20,7 +20,7 @@
#include <linux/mfd/core.h> #include <linux/mfd/core.h>
#include <linux/mfd/tps6105x.h> #include <linux/mfd/tps6105x.h>
static const int tps6105x_voltages[] = { static const unsigned int tps6105x_voltages[] = {
4500000, 4500000,
5000000, 5000000,
5250000, 5250000,
@ -105,22 +105,13 @@ static int tps6105x_regulator_set_voltage_sel(struct regulator_dev *rdev,
return 0; return 0;
} }
static int tps6105x_regulator_list_voltage(struct regulator_dev *rdev,
unsigned selector)
{
if (selector >= ARRAY_SIZE(tps6105x_voltages))
return -EINVAL;
return tps6105x_voltages[selector];
}
static struct regulator_ops tps6105x_regulator_ops = { static struct regulator_ops tps6105x_regulator_ops = {
.enable = tps6105x_regulator_enable, .enable = tps6105x_regulator_enable,
.disable = tps6105x_regulator_disable, .disable = tps6105x_regulator_disable,
.is_enabled = tps6105x_regulator_is_enabled, .is_enabled = tps6105x_regulator_is_enabled,
.get_voltage_sel = tps6105x_regulator_get_voltage_sel, .get_voltage_sel = tps6105x_regulator_get_voltage_sel,
.set_voltage_sel = tps6105x_regulator_set_voltage_sel, .set_voltage_sel = tps6105x_regulator_set_voltage_sel,
.list_voltage = tps6105x_regulator_list_voltage, .list_voltage = regulator_list_voltage_table,
}; };
static const struct regulator_desc tps6105x_regulator_desc = { static const struct regulator_desc tps6105x_regulator_desc = {
@ -130,6 +121,7 @@ static const struct regulator_desc tps6105x_regulator_desc = {
.id = 0, .id = 0,
.owner = THIS_MODULE, .owner = THIS_MODULE,
.n_voltages = ARRAY_SIZE(tps6105x_voltages), .n_voltages = ARRAY_SIZE(tps6105x_voltages),
.volt_table = tps6105x_voltages,
}; };
/* /*