openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

regulator: gpio-regulator: populate selector from set_voltage 

This was missing until now and the underlying
_regulator_do_set_voltage is using this value when calling list_voltage.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Acked-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Heiko Stübner 2012-06-03 21:32:05 +02:00 committed by Mark Brown
parent 00926369b7
commit b0e4d7bf8b
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/regulator/gpio-regulator.c
View File

@ -101,7 +101,7 @@ static int gpio_regulator_get_value(struct regulator_dev *dev)
} }
static int gpio_regulator_set_value(struct regulator_dev *dev, static int gpio_regulator_set_value(struct regulator_dev *dev,
int min, int max) int min, int max, unsigned *selector)
{ {
struct gpio_regulator_data *data = rdev_get_drvdata(dev); struct gpio_regulator_data *data = rdev_get_drvdata(dev);
int ptr, target = 0, state, best_val = INT_MAX; int ptr, target = 0, state, best_val = INT_MAX;
@ -112,6 +112,8 @@ static int gpio_regulator_set_value(struct regulator_dev *dev,
data->states[ptr].value <= max) { data->states[ptr].value <= max) {
target = data->states[ptr].gpios; target = data->states[ptr].gpios;
best_val = data->states[ptr].value; best_val = data->states[ptr].value;
if (selector)
*selector = ptr;
} }
if (best_val == INT_MAX) if (best_val == INT_MAX)
@ -130,7 +132,7 @@ static int gpio_regulator_set_voltage(struct regulator_dev *dev,
int min_uV, int max_uV, int min_uV, int max_uV,
unsigned *selector) unsigned *selector)
{ {
return gpio_regulator_set_value(dev, min_uV, max_uV); return gpio_regulator_set_value(dev, min_uV, max_uV, selector);
} }
static int gpio_regulator_list_voltage(struct regulator_dev *dev, static int gpio_regulator_list_voltage(struct regulator_dev *dev,
@ -147,7 +149,7 @@ static int gpio_regulator_list_voltage(struct regulator_dev *dev,
static int gpio_regulator_set_current_limit(struct regulator_dev *dev, static int gpio_regulator_set_current_limit(struct regulator_dev *dev,
int min_uA, int max_uA) int min_uA, int max_uA)
{ {
return gpio_regulator_set_value(dev, min_uA, max_uA); return gpio_regulator_set_value(dev, min_uA, max_uA, NULL);
} }
static struct regulator_ops gpio_regulator_voltage_ops = { static struct regulator_ops gpio_regulator_voltage_ops = {