| Message ID | 20181217084313.15379-1-u.kleine-koenig@pengutronix.de |
|---|---|
| State | New |
| Headers | show |
| Series | gpio: mvebu: only fail on missing clk if pwm is actually to be used | expand |
Hi, On lun., déc. 17 2018, Uwe Kleine-König <u.kleine-koenig@pengutronix.de> wrote: > The gpio IP on Armada 370 at offset 0x18180 has neither a clk nor pwm > registers. So there is no need for a clk as the pwm isn't used anyhow. > So only check for the clk in the presence of the pwm registers. This fixes > a failure to probe the gpio driver for the above mentioned gpio device. > > Fixes: 757642f9a584 ("gpio: mvebu: Add limited PWM support") > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Reviewed-by: Gregory CLEMENT <gregory.clement@bootlin.com> Thanks, Gregory > --- > drivers/gpio/gpio-mvebu.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpio/gpio-mvebu.c b/drivers/gpio/gpio-mvebu.c > index 6e02148c208b..adc768f908f1 100644 > --- a/drivers/gpio/gpio-mvebu.c > +++ b/drivers/gpio/gpio-mvebu.c > @@ -773,9 +773,6 @@ static int mvebu_pwm_probe(struct platform_device *pdev, > "marvell,armada-370-gpio")) > return 0; > > - if (IS_ERR(mvchip->clk)) > - return PTR_ERR(mvchip->clk); > - > /* > * There are only two sets of PWM configuration registers for > * all the GPIO lines on those SoCs which this driver reserves > @@ -786,6 +783,9 @@ static int mvebu_pwm_probe(struct platform_device *pdev, > if (!res) > return 0; > > + if (IS_ERR(mvchip->clk)) > + return PTR_ERR(mvchip->clk); > + > /* > * Use set A for lines of GPIO chip with id 0, B for GPIO chip > * with id 1. Don't allow further GPIO chips to be used for PWM. > -- > 2.19.2 > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
On Mon, Dec 17, 2018 at 9:43 AM Uwe Kleine-König <u.kleine-koenig@pengutronix.de> wrote: > The gpio IP on Armada 370 at offset 0x18180 has neither a clk nor pwm > registers. So there is no need for a clk as the pwm isn't used anyhow. > So only check for the clk in the presence of the pwm registers. This fixes > a failure to probe the gpio driver for the above mentioned gpio device. > > Fixes: 757642f9a584 ("gpio: mvebu: Add limited PWM support") > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Patch applied for fixes with Gregory's review tag! Will try to get this upstream with some other GPIO fixes ASAP. Yours, Linus Walleij
diff --git a/drivers/gpio/gpio-mvebu.c b/drivers/gpio/gpio-mvebu.c index 6e02148c208b..adc768f908f1 100644 --- a/drivers/gpio/gpio-mvebu.c +++ b/drivers/gpio/gpio-mvebu.c @@ -773,9 +773,6 @@ static int mvebu_pwm_probe(struct platform_device *pdev, "marvell,armada-370-gpio")) return 0; - if (IS_ERR(mvchip->clk)) - return PTR_ERR(mvchip->clk); - /* * There are only two sets of PWM configuration registers for * all the GPIO lines on those SoCs which this driver reserves @@ -786,6 +783,9 @@ static int mvebu_pwm_probe(struct platform_device *pdev, if (!res) return 0; + if (IS_ERR(mvchip->clk)) + return PTR_ERR(mvchip->clk); + /* * Use set A for lines of GPIO chip with id 0, B for GPIO chip * with id 1. Don't allow further GPIO chips to be used for PWM.
The gpio IP on Armada 370 at offset 0x18180 has neither a clk nor pwm registers. So there is no need for a clk as the pwm isn't used anyhow. So only check for the clk in the presence of the pwm registers. This fixes a failure to probe the gpio driver for the above mentioned gpio device. Fixes: 757642f9a584 ("gpio: mvebu: Add limited PWM support") Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> --- drivers/gpio/gpio-mvebu.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)