mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-14 12:37:32 +00:00
Merge remote-tracking branch 'regulator/topic/gpio' into regulator-next
This commit is contained in:
commit
a4dba88e63
2 changed files with 3 additions and 6 deletions
|
@ -3233,7 +3233,7 @@ static int add_regulator_attributes(struct regulator_dev *rdev)
|
||||||
if (status < 0)
|
if (status < 0)
|
||||||
return status;
|
return status;
|
||||||
}
|
}
|
||||||
if (ops->is_enabled) {
|
if (rdev->ena_gpio || ops->is_enabled) {
|
||||||
status = device_create_file(dev, &dev_attr_state);
|
status = device_create_file(dev, &dev_attr_state);
|
||||||
if (status < 0)
|
if (status < 0)
|
||||||
return status;
|
return status;
|
||||||
|
|
|
@ -132,7 +132,7 @@ static struct regulator_ops gpio_regulator_voltage_ops = {
|
||||||
.list_voltage = gpio_regulator_list_voltage,
|
.list_voltage = gpio_regulator_list_voltage,
|
||||||
};
|
};
|
||||||
|
|
||||||
struct gpio_regulator_config *
|
static struct gpio_regulator_config *
|
||||||
of_get_gpio_regulator_config(struct device *dev, struct device_node *np)
|
of_get_gpio_regulator_config(struct device *dev, struct device_node *np)
|
||||||
{
|
{
|
||||||
struct gpio_regulator_config *config;
|
struct gpio_regulator_config *config;
|
||||||
|
@ -163,10 +163,7 @@ of_get_gpio_regulator_config(struct device *dev, struct device_node *np)
|
||||||
config->enable_gpio = of_get_named_gpio(np, "enable-gpio", 0);
|
config->enable_gpio = of_get_named_gpio(np, "enable-gpio", 0);
|
||||||
|
|
||||||
/* Fetch GPIOs. */
|
/* Fetch GPIOs. */
|
||||||
for (i = 0; ; i++)
|
config->nr_gpios = of_gpio_count(np);
|
||||||
if (of_get_named_gpio(np, "gpios", i) < 0)
|
|
||||||
break;
|
|
||||||
config->nr_gpios = i;
|
|
||||||
|
|
||||||
config->gpios = devm_kzalloc(dev,
|
config->gpios = devm_kzalloc(dev,
|
||||||
sizeof(struct gpio) * config->nr_gpios,
|
sizeof(struct gpio) * config->nr_gpios,
|
||||||
|
|
Loading…
Reference in a new issue