diff options
| -rw-r--r-- | drivers/regulator/gpio-regulator.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/regulator/gpio-regulator.c b/drivers/regulator/gpio-regulator.c index 2c38bea5065e..242851a4c1a6 100644 --- a/drivers/regulator/gpio-regulator.c +++ b/drivers/regulator/gpio-regulator.c | |||
| @@ -101,7 +101,7 @@ static int gpio_regulator_get_value(struct regulator_dev *dev) | |||
| 101 | } | 101 | } |
| 102 | 102 | ||
| 103 | static int gpio_regulator_set_value(struct regulator_dev *dev, | 103 | static int gpio_regulator_set_value(struct regulator_dev *dev, |
| 104 | int min, int max) | 104 | int min, int max, unsigned *selector) |
| 105 | { | 105 | { |
| 106 | struct gpio_regulator_data *data = rdev_get_drvdata(dev); | 106 | struct gpio_regulator_data *data = rdev_get_drvdata(dev); |
| 107 | int ptr, target = 0, state, best_val = INT_MAX; | 107 | int ptr, target = 0, state, best_val = INT_MAX; |
| @@ -112,6 +112,8 @@ static int gpio_regulator_set_value(struct regulator_dev *dev, | |||
| 112 | data->states[ptr].value <= max) { | 112 | data->states[ptr].value <= max) { |
| 113 | target = data->states[ptr].gpios; | 113 | target = data->states[ptr].gpios; |
| 114 | best_val = data->states[ptr].value; | 114 | best_val = data->states[ptr].value; |
| 115 | if (selector) | ||
| 116 | *selector = ptr; | ||
| 115 | } | 117 | } |
| 116 | 118 | ||
| 117 | if (best_val == INT_MAX) | 119 | if (best_val == INT_MAX) |
| @@ -130,7 +132,7 @@ static int gpio_regulator_set_voltage(struct regulator_dev *dev, | |||
| 130 | int min_uV, int max_uV, | 132 | int min_uV, int max_uV, |
| 131 | unsigned *selector) | 133 | unsigned *selector) |
| 132 | { | 134 | { |
| 133 | return gpio_regulator_set_value(dev, min_uV, max_uV); | 135 | return gpio_regulator_set_value(dev, min_uV, max_uV, selector); |
| 134 | } | 136 | } |
| 135 | 137 | ||
| 136 | static int gpio_regulator_list_voltage(struct regulator_dev *dev, | 138 | 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 | static int gpio_regulator_set_current_limit(struct regulator_dev *dev, | 149 | static int gpio_regulator_set_current_limit(struct regulator_dev *dev, |
| 148 | int min_uA, int max_uA) | 150 | int min_uA, int max_uA) |
| 149 | { | 151 | { |
| 150 | return gpio_regulator_set_value(dev, min_uA, max_uA); | 152 | return gpio_regulator_set_value(dev, min_uA, max_uA, NULL); |
| 151 | } | 153 | } |
| 152 | 154 | ||
| 153 | static struct regulator_ops gpio_regulator_voltage_ops = { | 155 | static struct regulator_ops gpio_regulator_voltage_ops = { |
