Commit 967cfb18c0e331b43a29ae7f60ec1ef0dcb02f6b
Committed by
Mark Brown
Mark Brown
1 parent
f19b00da8e
Exists in
smarc-l5.0.0_1.0.0-ga
and in
5 other branches
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: Milo(Woogyom) Kim <milo.kim@ti.com> Reviewed-by: Axel Lin <axel.lin@ingics.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Showing 1 changed file with 44 additions and 6 deletions Side-by-side Diff
drivers/regulator/core.c
| ... | ... | @@ -1529,6 +1529,42 @@ |
| 1529 | 1529 | } |
| 1530 | 1530 | } |
| 1531 | 1531 | |
| 1532 | +/** | |
| 1533 | + * Balance enable_count of each GPIO and actual GPIO pin control. | |
| 1534 | + * GPIO is enabled in case of initial use. (enable_count is 0) | |
| 1535 | + * GPIO is disabled when it is not shared any more. (enable_count <= 1) | |
| 1536 | + */ | |
| 1537 | +static int regulator_ena_gpio_ctrl(struct regulator_dev *rdev, bool enable) | |
| 1538 | +{ | |
| 1539 | + struct regulator_enable_gpio *pin = rdev->ena_pin; | |
| 1540 | + | |
| 1541 | + if (!pin) | |
| 1542 | + return -EINVAL; | |
| 1543 | + | |
| 1544 | + if (enable) { | |
| 1545 | + /* Enable GPIO at initial use */ | |
| 1546 | + if (pin->enable_count == 0) | |
| 1547 | + gpio_set_value_cansleep(pin->gpio, | |
| 1548 | + !pin->ena_gpio_invert); | |
| 1549 | + | |
| 1550 | + pin->enable_count++; | |
| 1551 | + } else { | |
| 1552 | + if (pin->enable_count > 1) { | |
| 1553 | + pin->enable_count--; | |
| 1554 | + return 0; | |
| 1555 | + } | |
| 1556 | + | |
| 1557 | + /* Disable GPIO if not used */ | |
| 1558 | + if (pin->enable_count <= 1) { | |
| 1559 | + gpio_set_value_cansleep(pin->gpio, | |
| 1560 | + pin->ena_gpio_invert); | |
| 1561 | + pin->enable_count = 0; | |
| 1562 | + } | |
| 1563 | + } | |
| 1564 | + | |
| 1565 | + return 0; | |
| 1566 | +} | |
| 1567 | + | |
| 1532 | 1568 | static int _regulator_do_enable(struct regulator_dev *rdev) |
| 1533 | 1569 | { |
| 1534 | 1570 | int ret, delay; |
| ... | ... | @@ -1544,9 +1580,10 @@ |
| 1544 | 1580 | |
| 1545 | 1581 | trace_regulator_enable(rdev_get_name(rdev)); |
| 1546 | 1582 | |
| 1547 | - if (rdev->ena_gpio) { | |
| 1548 | - gpio_set_value_cansleep(rdev->ena_gpio, | |
| 1549 | - !rdev->ena_gpio_invert); | |
| 1583 | + if (rdev->ena_pin) { | |
| 1584 | + ret = regulator_ena_gpio_ctrl(rdev, true); | |
| 1585 | + if (ret < 0) | |
| 1586 | + return ret; | |
| 1550 | 1587 | rdev->ena_gpio_state = 1; |
| 1551 | 1588 | } else if (rdev->desc->ops->enable) { |
| 1552 | 1589 | ret = rdev->desc->ops->enable(rdev); |
| ... | ... | @@ -1648,9 +1685,10 @@ |
| 1648 | 1685 | |
| 1649 | 1686 | trace_regulator_disable(rdev_get_name(rdev)); |
| 1650 | 1687 | |
| 1651 | - if (rdev->ena_gpio) { | |
| 1652 | - gpio_set_value_cansleep(rdev->ena_gpio, | |
| 1653 | - rdev->ena_gpio_invert); | |
| 1688 | + if (rdev->ena_pin) { | |
| 1689 | + ret = regulator_ena_gpio_ctrl(rdev, false); | |
| 1690 | + if (ret < 0) | |
| 1691 | + return ret; | |
| 1654 | 1692 | rdev->ena_gpio_state = 0; |
| 1655 | 1693 | |
| 1656 | 1694 | } else if (rdev->desc->ops->disable) { |