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

Commit 7b74d149 authored by Kim, Milo's avatar Kim, Milo Committed by Mark Brown
Browse files

regulator: core: use regulator_ena_pin member 



 The regulator_dev has regulator_enable_gpio structure.
 'ena_gpio' and 'ena_gpio_invert' were moved to in regulator_enable_gpio.

  regulator_dev   --->   regulator_enable_gpio
  .ena_gpio              .gpio
  .ena_gpio_invert       .ena_gpio_invert

  Pointer, 'ena_pin' is used for checking valid enable GPIO pin.

Signed-off-by: default avatarMilo(Woogyom) Kim <milo.kim@ti.com>
Reviewed-by: default avatarAxel Lin <axel.lin@ingics.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 967cfb18

drivers/regulator/core.c

+3 −3
Original line number Diff line number Diff line
@@ -1945,7 +1945,7 @@ EXPORT_SYMBOL_GPL(regulator_disable_regmap); 
static int _regulator_is_enabled(struct regulator_dev *rdev)

{

	/* A GPIO control always takes precedence */

	if (rdev->ena_gpio)

	if (rdev->ena_pin)

		return rdev->ena_gpio_state;



	/* If we don't know then assume that the regulator is always on */
@@ -3344,7 +3344,7 @@ static int add_regulator_attributes(struct regulator_dev *rdev) 
		if (status < 0)

			return status;

	}

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

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

		status = device_create_file(dev, &dev_attr_state);

		if (status < 0)

			return status;
@@ -3556,7 +3556,7 @@ regulator_register(const struct regulator_desc *regulator_desc, 
		if (config->ena_gpio_flags & GPIOF_OUT_INIT_HIGH)

			rdev->ena_gpio_state = 1;



		if (rdev->ena_gpio_invert)

		if (config->ena_gpio_invert)

			rdev->ena_gpio_state = !rdev->ena_gpio_state;

	}

include/linux/regulator/driver.h

+0 −2
Original line number Diff line number Diff line
@@ -302,8 +302,6 @@ struct regulator_dev { 
	struct dentry *debugfs;



	struct regulator_enable_gpio *ena_pin;

	int ena_gpio;

	unsigned int ena_gpio_invert:1;

	unsigned int ena_gpio_state:1;

};