p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

regulator: pwm: Use pwm_get_args() where appropriate 

The PWM framework has clarified the concept of reference PWM config (the
platform dependent config retrieved from the DT or the PWM lookup table)
and real PWM state.

Use pwm_get_args() when the PWM user wants to retrieve this reference
config and not the current state.

This is part of the rework allowing the PWM framework to support
hardware readout and expose real PWM state even when the PWM has just
been requested (before the user calls pwm_config/enable/disable()).

Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Acked-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Thierry Reding <thierry.reding@gmail.com>
This commit is contained in:
Boris Brezillon 2016-04-14 21:17:27 +02:00 committed by Thierry Reding
parent 1b50673dfa
commit 6bc24526f8
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/regulator/pwm-regulator.c
View File

@ -59,16 +59,16 @@ static int pwm_regulator_set_voltage_sel(struct regulator_dev *rdev,
unsigned selector) unsigned selector)
{ {
struct pwm_regulator_data *drvdata = rdev_get_drvdata(rdev); struct pwm_regulator_data *drvdata = rdev_get_drvdata(rdev);
unsigned int pwm_reg_period; struct pwm_args pargs;
int dutycycle; int dutycycle;
int ret; int ret;
pwm_reg_period = pwm_get_period(drvdata->pwm); pwm_get_args(drvdata->pwm, &pargs);
dutycycle = (pwm_reg_period * dutycycle = (pargs.period *
drvdata->duty_cycle_table[selector].dutycycle) / 100; drvdata->duty_cycle_table[selector].dutycycle) / 100;
ret = pwm_config(drvdata->pwm, dutycycle, pwm_reg_period); ret = pwm_config(drvdata->pwm, dutycycle, pargs.period);
if (ret) { if (ret) {
dev_err(&rdev->dev, "Failed to configure PWM\n"); dev_err(&rdev->dev, "Failed to configure PWM\n");
return ret; return ret;
@ -138,13 +138,15 @@ static int pwm_regulator_set_voltage(struct regulator_dev *rdev,
{ {
struct pwm_regulator_data *drvdata = rdev_get_drvdata(rdev); struct pwm_regulator_data *drvdata = rdev_get_drvdata(rdev);
unsigned int ramp_delay = rdev->constraints->ramp_delay; unsigned int ramp_delay = rdev->constraints->ramp_delay;
unsigned int period = pwm_get_period(drvdata->pwm); struct pwm_args pargs;
int duty_cycle; int duty_cycle;
int ret; int ret;
pwm_get_args(drvdata->pwm, &pargs);
duty_cycle = pwm_voltage_to_duty_cycle_percentage(rdev, min_uV); duty_cycle = pwm_voltage_to_duty_cycle_percentage(rdev, min_uV);
ret = pwm_config(drvdata->pwm, (period / 100) * duty_cycle, period); ret = pwm_config(drvdata->pwm, (pargs.period / 100) * duty_cycle,
pargs.period);
if (ret) { if (ret) {
dev_err(&rdev->dev, "Failed to configure PWM\n"); dev_err(&rdev->dev, "Failed to configure PWM\n");
return ret; return ret;
@ -281,6 +283,12 @@ static int pwm_regulator_probe(struct platform_device *pdev)
return PTR_ERR(drvdata->pwm); return PTR_ERR(drvdata->pwm);
} }
/*
* FIXME: pwm_apply_args() should be removed when switching to the
* atomic PWM API.
*/
pwm_apply_args(drvdata->pwm);
regulator = devm_regulator_register(&pdev->dev, regulator = devm_regulator_register(&pdev->dev,
&drvdata->desc, &config); &drvdata->desc, &config);
if (IS_ERR(regulator)) { if (IS_ERR(regulator)) {