summaryrefslogtreecommitdiffstats
path: root/drivers/regulator
diff options
context:
space:
mode:
authorBoris Brezillon <boris.brezillon@free-electrons.com>2016-06-14 11:13:20 +0200
committerThierry Reding <thierry.reding@gmail.com>2016-07-11 08:44:29 +0200
commitd9070fdbe40a04b61262bac0f7ff0c7c29a68015 (patch)
tree06eb17c64d51968825b97a9ed43e7aa2a159e1d9 /drivers/regulator
parent87248991a1de28e73dc30057e82d831bc11cdd44 (diff)
downloadlinux-d9070fdbe40a04b61262bac0f7ff0c7c29a68015.tar.bz2
regulator: pwm: Retrieve correct voltage
The continuous PWM voltage regulator is caching the voltage value in the ->volt_uV field. While most of the time this value should reflect the real voltage, sometime it can be sightly different if the PWM device rounded the set_duty_cycle request. Moreover, this value is not valid until someone has modified the regulator output. Remove the ->volt_uV field and always rely on the PWM state to calculate the regulator output. Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com> Reviewed-by: Brian Norris <briannorris@chromium.org> Tested-by: Brian Norris <briannorris@chromium.org> Tested-by: Heiko Stuebner <heiko@sntech.de> Acked-by: Mark Brown <broonie@kernel.org> Signed-off-by: Thierry Reding <thierry.reding@gmail.com>
Diffstat (limited to 'drivers/regulator')
-rw-r--r--drivers/regulator/pwm-regulator.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/regulator/pwm-regulator.c b/drivers/regulator/pwm-regulator.c
index 7d26d3b0eed6..ae0bebbfda9d 100644
--- a/drivers/regulator/pwm-regulator.c
+++ b/drivers/regulator/pwm-regulator.c
@@ -37,9 +37,6 @@ struct pwm_regulator_data {
int state;
- /* Continuous voltage */
- int volt_uV;
-
/* Enable GPIO */
struct gpio_desc *enb_gpio;
};
@@ -148,8 +145,13 @@ static int pwm_regulator_is_enabled(struct regulator_dev *dev)
static int pwm_regulator_get_voltage(struct regulator_dev *rdev)
{
struct pwm_regulator_data *drvdata = rdev_get_drvdata(rdev);
+ int min_uV = rdev->constraints->min_uV;
+ int diff = rdev->constraints->max_uV - min_uV;
+ struct pwm_state pstate;
- return drvdata->volt_uV;
+ pwm_get_state(drvdata->pwm, &pstate);
+
+ return min_uV + pwm_get_relative_duty_cycle(&pstate, diff);
}
static int pwm_regulator_set_voltage(struct regulator_dev *rdev,
@@ -176,8 +178,6 @@ static int pwm_regulator_set_voltage(struct regulator_dev *rdev,
return ret;
}
- drvdata->volt_uV = min_uV;
-
if ((ramp_delay == 0) || !pwm_regulator_is_enabled(rdev))
return 0;