Commit b0e4d7bf authored by Heiko Stübner's avatar Heiko Stübner Committed by Mark Brown

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: default avatarHeiko Stuebner <heiko@sntech.de>
Acked-by: default avatarAxel Lin <axel.lin@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 00926369
...@@ -101,7 +101,7 @@ static int gpio_regulator_get_value(struct regulator_dev *dev) ...@@ -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, ...@@ -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, ...@@ -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, ...@@ -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 = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment