[PATCH v5 28/46] regulator: pwm: swith to the atomic PWM API

Boris Brezillon
2016-03-30T20:03:51Z

pwm_config/enable/disable() have been deprecated in favor of
pwm_apply_state().
Replace all those calls with the equivalent pwm_get/apply_state().

Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
---
drivers/regulator/pwm-regulator.c | 54 ++++++++++++++++++++++++---------------
1 file changed, 34 insertions(+), 20 deletions(-)

diff --git a/drivers/regulator/pwm-regulator.c b/drivers/regulator/pwm-regulator.c
index 9590fb0..42cc312 100644
--- a/drivers/regulator/pwm-regulator.c
+++ b/drivers/regulator/pwm-regulator.c
@@ -59,16 +59,18 @@ static int pwm_regulator_set_voltage_sel(struct regulator_dev *rdev,
unsigned selector)
{
struct pwm_regulator_data *drvdata = rdev_get_drvdata(rdev);
- struct pwm_args pargs = { };
- int dutycycle;
+ struct pwm_state pstate = { };
+ u64 dutycycle;
int ret;

- pwm_get_args(drvdata->pwm, &pargs);
+ pwm_get_state(drvdata->pwm, &pstate);

- dutycycle = (pargs.period *
- drvdata->duty_cycle_table[selector].dutycycle) / 100;
+ dutycycle = drvdata->duty_cycle_table[selector].dutycycle;
+ dutycycle *= pstate.period;
+ do_div(dutycycle, 100);
+ pstate.duty_cycle = dutycycle;

- ret = pwm_config(drvdata->pwm, dutycycle, pargs.period);
+ ret = pwm_apply_state(drvdata->pwm, &pstate);
if (ret) {
dev_err(&rdev->dev, "Failed to configure PWM\n");
return ret;
@@ -93,24 +95,39 @@ static int pwm_regulator_list_voltage(struct regulator_dev *rdev,
static int pwm_regulator_enable(struct regulator_dev *dev)
{
struct pwm_regulator_data *drvdata = rdev_get_drvdata(dev);
+ struct pwm_state pstate = { };
+
+ pwm_get_state(drvdata->pwm, &pstate);
+ if (pstate.enabled)
+ return 0;
+
+ pstate.enabled = true;

- return pwm_enable(drvdata->pwm);
+ return pwm_apply_state(drvdata->pwm, &pstate);
}

static int pwm_regulator_disable(struct regulator_dev *dev)
{
struct pwm_regulator_data *drvdata = rdev_get_drvdata(dev);
+ struct pwm_state pstate = { };

- pwm_disable(drvdata->pwm);
+ pwm_get_state(drvdata->pwm, &pstate);
+ if (!pstate.enabled)
+ return 0;

- return 0;
+ pstate.enabled = false;
+
+ return pwm_apply_state(drvdata->pwm, &pstate);
}

static int pwm_regulator_is_enabled(struct regulator_dev *dev)
{
struct pwm_regulator_data *drvdata = rdev_get_drvdata(dev);
+ struct pwm_state pstate = { };

- return pwm_is_enabled(drvdata->pwm);
+ pwm_get_state(drvdata->pwm, &pstate);
+
+ return pstate.enabled;
}

/**
@@ -138,25 +155,22 @@ static int pwm_regulator_set_voltage(struct regulator_dev *rdev,
{
struct pwm_regulator_data *drvdata = rdev_get_drvdata(rdev);
unsigned int ramp_delay = rdev->constraints->ramp_delay;
- struct pwm_args pargs = { };
- int duty_cycle;
+ struct pwm_state pstate = { };
+ u64 duty_cycle;
int ret;

- pwm_get_args(drvdata->pwm, &pargs);
+ pwm_get_state(drvdata->pwm, &pstate);
duty_cycle = pwm_voltage_to_duty_cycle_percentage(rdev, min_uV);
+ duty_cycle *= pstate.period;
+ do_div(duty_cycle, 100);
+ pstate.duty_cycle = duty_cycle;

- ret = pwm_config(drvdata->pwm, (pargs.period / 100) * duty_cycle,
- pargs.period);
+ ret = pwm_apply_state(drvdata->pwm, &pstate);
if (ret) {
dev_err(&rdev->dev, "Failed to configure PWM\n");
return ret;
}

- ret = pwm_enable(drvdata->pwm);
- if (ret) {
- dev_err(&rdev->dev, "Failed to enable PWM\n");
- return ret;
- }
drvdata->volt_uV = min_uV;

/* Delay required by PWM regulator to settle to the new voltage */
--
2.5.0