| Message ID | 1465024214-22120-21-git-send-email-shc_work@mail.ru (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Sat, Jun 4, 2016 at 9:10 AM, Alexander Shiyan <shc_work@mail.ru> wrote: > Since board support for the CLPS711X platform was removed, > remove the board support from the driver. > > Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Patch applied to the GPIO tree. BTW I hope it's OK to take these three patches and apply separately, else tell me and I'll take them out again and you can have my Acked-by if you want to take them through ARM SoC instead. Yours, Linus Walleij
On Wednesday, June 8, 2016 10:51:14 AM CEST Linus Walleij wrote: > On Sat, Jun 4, 2016 at 9:10 AM, Alexander Shiyan <shc_work@mail.ru> wrote: > > > Since board support for the CLPS711X platform was removed, > > remove the board support from the driver. > > > > Signed-off-by: Alexander Shiyan <shc_work@mail.ru> > > Patch applied to the GPIO tree. > > BTW I hope it's OK to take these three patches and apply > separately, else tell me and I'll take them out again and you > can have my Acked-by if you want to take them through ARM > SoC instead. I think that's fine. We will have a short time span during the merge window in which not everything works with either DT or the board files, but as Alexander explained, this hardware is now obsolete, so I think that is ok in this instance, and it makes the migration easier. Arnd
diff --git a/drivers/gpio/gpio-clps711x.c b/drivers/gpio/gpio-clps711x.c index cd3781e..52fd63f 100644 --- a/drivers/gpio/gpio-clps711x.c +++ b/drivers/gpio/gpio-clps711x.c @@ -20,8 +20,12 @@ static int clps711x_gpio_probe(struct platform_device *pdev) void __iomem *dat, *dir; struct gpio_chip *gc; struct resource *res; - int err, id = np ? of_alias_get_id(np, "gpio") : pdev->id; + int err, id; + if (!np) + return -ENODEV; + + id = of_alias_get_id(np, "gpio"); if ((id < 0) || (id > 4)) return -ENODEV; @@ -63,7 +67,7 @@ static int clps711x_gpio_probe(struct platform_device *pdev) break; } - gc->base = id * 8; + gc->base = -1; gc->owner = THIS_MODULE; platform_set_drvdata(pdev, gc);
Since board support for the CLPS711X platform was removed, remove the board support from the driver. Signed-off-by: Alexander Shiyan <shc_work@mail.ru> --- drivers/gpio/gpio-clps711x.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)