| Message ID | 1464942192-25967-10-git-send-email-boris.brezillon@free-electrons.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Jun 03, 2016 at 10:23:07AM +0200, Boris Brezillon wrote: > The PWM attached to a PWM regulator device might have been previously > configured by the bootloader. > Make sure the bootloader and linux config are in sync, and adjust the PWM > config if that's not the case. > > Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com> > Acked-by: Mark Brown <broonie@kernel.org> > --- > drivers/regulator/pwm-regulator.c | 8 +++----- > 1 file changed, 3 insertions(+), 5 deletions(-) > > diff --git a/drivers/regulator/pwm-regulator.c b/drivers/regulator/pwm-regulator.c > index ab3cc02..524b43f 100644 > --- a/drivers/regulator/pwm-regulator.c > +++ b/drivers/regulator/pwm-regulator.c > @@ -285,11 +285,9 @@ static int pwm_regulator_probe(struct platform_device *pdev) > return ret; > } > > - /* > - * FIXME: pwm_apply_args() should be removed when switching to the > - * atomic PWM API. > - */ > - pwm_apply_args(drvdata->pwm); > + ret = pwm_adjust_config(drvdata->pwm); > + if (ret) > + return ret; > > regulator = devm_regulator_register(&pdev->dev, > &drvdata->desc, &config); Acked-by: Brian Norris <briannorris@chromium.org> Tested-by: Brian Norris <briannorris@chromium.org>
diff --git a/drivers/regulator/pwm-regulator.c b/drivers/regulator/pwm-regulator.c index ab3cc02..524b43f 100644 --- a/drivers/regulator/pwm-regulator.c +++ b/drivers/regulator/pwm-regulator.c @@ -285,11 +285,9 @@ static int pwm_regulator_probe(struct platform_device *pdev) return ret; } - /* - * FIXME: pwm_apply_args() should be removed when switching to the - * atomic PWM API. - */ - pwm_apply_args(drvdata->pwm); + ret = pwm_adjust_config(drvdata->pwm); + if (ret) + return ret; regulator = devm_regulator_register(&pdev->dev, &drvdata->desc, &config);