From mboxrd@z Thu Jan 1 00:00:00 1970 From: briannorris@chromium.org (Brian Norris) Date: Fri, 3 Jun 2016 13:41:04 -0700 Subject: [PATCH 09/14] regulator: pwm: Adjust PWM config at probe time In-Reply-To: <1464942192-25967-10-git-send-email-boris.brezillon@free-electrons.com> References: <1464942192-25967-1-git-send-email-boris.brezillon@free-electrons.com> <1464942192-25967-10-git-send-email-boris.brezillon@free-electrons.com> Message-ID: <20160603204104.GG124478@google.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org 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 > Acked-by: Mark Brown > --- > 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 Tested-by: Brian Norris