lkml.org 
[lkml]   [2014]   [Feb]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] regulator: core bugfix: Use normal enable for always_on regulators
Date
always_on regulators are currently enabled at registration using the
enable function of struct regulator_ops.

The regulator framework does support gpios to enable/disable regulators.
gpios are not handled through struct regulator_ops functions as they are
a basic component of the framework. Instead they are handled within
_regulator_do_enable(). Unfortunately always-on regulator do not use
this function, to gpio-controlled always-on regulators which are not
enabled on boot. Furthermore they are disabled the whole time because
regulator_enable() does not call _regulator_do_enable() for always-on
regulator.

This patch seperates _regulator_do_enable_no_delay from the
_regulator_do_enable function to be able to call the enable function
without delays. It then fixes the always_on behaviour by using this
function.

Cc: stable@vger.kernel.org
Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
---
drivers/regulator/core.c | 45 +++++++++++++++++++++++++++------------------
1 file changed, 27 insertions(+), 18 deletions(-)

diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 16a309e..8469244 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -953,6 +953,8 @@ static int machine_constraints_current(struct regulator_dev *rdev,
return 0;
}

+static int _regulator_do_enable_no_delay(struct regulator_dev *rdev);
+
/**
* set_machine_constraints - sets regulator constraints
* @rdev: regulator source
@@ -1013,9 +1015,8 @@ static int set_machine_constraints(struct regulator_dev *rdev,
/* If the constraints say the regulator should be on at this point
* and we have control then make sure it is enabled.
*/
- if ((rdev->constraints->always_on || rdev->constraints->boot_on) &&
- ops->enable) {
- ret = ops->enable(rdev);
+ if (rdev->constraints->always_on || rdev->constraints->boot_on) {
+ ret = _regulator_do_enable_no_delay(rdev);
if (ret < 0) {
rdev_err(rdev, "failed to enable\n");
goto out;
@@ -1745,6 +1746,24 @@ static int regulator_ena_gpio_ctrl(struct regulator_dev *rdev, bool enable)
return 0;
}

+static int _regulator_do_enable_no_delay(struct regulator_dev *rdev)
+{
+ int ret;
+
+ 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);
+ } else {
+ ret = -EINVAL;
+ }
+
+ return ret;
+}
+
static int _regulator_do_enable(struct regulator_dev *rdev)
{
int ret, delay;
@@ -1760,18 +1779,9 @@ static int _regulator_do_enable(struct regulator_dev *rdev)

trace_regulator_enable(rdev_get_name(rdev));

- 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);
- if (ret < 0)
- return ret;
- } else {
- return -EINVAL;
- }
+ ret = _regulator_do_enable_no_delay(rdev);
+ if (ret)
+ return ret;

/* Allow the regulator to ramp; it would be useful to extend
* this for bulk operations so that the regulators can ramp
@@ -3633,9 +3643,8 @@ int regulator_suspend_finish(void)
struct regulator_ops *ops = rdev->desc->ops;

mutex_lock(&rdev->mutex);
- if ((rdev->use_count > 0 || rdev->constraints->always_on) &&
- ops->enable) {
- error = ops->enable(rdev);
+ if (rdev->use_count > 0 || rdev->constraints->always_on) {
+ error = _regulator_do_enable_no_delay(rdev);
if (error)
ret = error;
} else {
--
1.8.5.3


\
 
 \ /
  Last update: 2014-02-16 20:41    [W:1.467 / U:0.076 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site