Commit 967cfb18 authored by Kim, Milo's avatar Kim, Milo Committed by Mark Brown
Browse files

regulator: core: manage enable GPIO list 



 To support shared enable GPIO pin, replace GPIO code with new static functions

 Reference count: 'enable_count'
   Balance the reference count of each GPIO and actual pin control.
   The count is incremented with enabling GPIO.
   On the other hand, it is decremented on disabling GPIO.
   Actual GPIO pin is enabled at the initial use.(enable_count = 0)
   The pin is disabled if it is not used(shared) any more. (enable_count <=1)
   Regardless of the enable count, update GPIO state of the regulator.

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 f19b00da

drivers/regulator/core.c

+44 −6
Original line number Diff line number Diff line
@@ -1529,6 +1529,42 @@ static void regulator_ena_gpio_free(struct regulator_dev *rdev) 
	}

}



/**

 * Balance enable_count of each GPIO and actual GPIO pin control.

 * GPIO is enabled in case of initial use. (enable_count is 0)

 * GPIO is disabled when it is not shared any more. (enable_count <= 1)

 */

static int regulator_ena_gpio_ctrl(struct regulator_dev *rdev, bool enable)

{

	struct regulator_enable_gpio *pin = rdev->ena_pin;



	if (!pin)

		return -EINVAL;



	if (enable) {

		/* Enable GPIO at initial use */

		if (pin->enable_count == 0)

			gpio_set_value_cansleep(pin->gpio,

						!pin->ena_gpio_invert);



		pin->enable_count++;

	} else {

		if (pin->enable_count > 1) {

			pin->enable_count--;

			return 0;

		}



		/* Disable GPIO if not used */

		if (pin->enable_count <= 1) {

			gpio_set_value_cansleep(pin->gpio,

						pin->ena_gpio_invert);

			pin->enable_count = 0;

		}

	}



	return 0;

}



static int _regulator_do_enable(struct regulator_dev *rdev)

{

	int ret, delay;
@@ -1544,9 +1580,10 @@ static int _regulator_do_enable(struct regulator_dev *rdev) 


	trace_regulator_enable(rdev_get_name(rdev));



	if (rdev->ena_gpio) {

		gpio_set_value_cansleep(rdev->ena_gpio,

					!rdev->ena_gpio_invert);

	if (rdev->ena_pin) {

		ret = regulator_ena_gpio_ctrl(rdev, true);

		if (ret < 0)

			return ret;

		rdev->ena_gpio_state = 1;

	} else if (rdev->desc->ops->enable) {

		ret = rdev->desc->ops->enable(rdev);
@@ -1648,9 +1685,10 @@ static int _regulator_do_disable(struct regulator_dev *rdev) 


	trace_regulator_disable(rdev_get_name(rdev));



	if (rdev->ena_gpio) {

		gpio_set_value_cansleep(rdev->ena_gpio,

					rdev->ena_gpio_invert);

	if (rdev->ena_pin) {

		ret = regulator_ena_gpio_ctrl(rdev, false);

		if (ret < 0)

			return ret;

		rdev->ena_gpio_state = 0;



	} else if (rdev->desc->ops->disable) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE