Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a4dba88e authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'regulator/topic/gpio' into regulator-next

parents eb230d4a 896b65f3

drivers/regulator/core.c

+1 −1
Original line number Diff line number Diff line
@@ -3233,7 +3233,7 @@ static int add_regulator_attributes(struct regulator_dev *rdev) 
		if (status < 0)

			return status;

	}

	if (ops->is_enabled) {

	if (rdev->ena_gpio || ops->is_enabled) {

		status = device_create_file(dev, &dev_attr_state);

		if (status < 0)

			return status;

drivers/regulator/gpio-regulator.c

+2 −5
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ static struct regulator_ops gpio_regulator_voltage_ops = { 
	.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)

{

	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);



	/* Fetch GPIOs. */

	for (i = 0; ; i++)

		if (of_get_named_gpio(np, "gpios", i) < 0)

			break;

	config->nr_gpios = i;

	config->nr_gpios = of_gpio_count(np);



	config->gpios = devm_kzalloc(dev,

				sizeof(struct gpio) * config->nr_gpios,