gpio: generic: Add label to platform data

When registering more than one platform device, it is
useful to set the gpio chip label in the platform data.

Signed-off-by: Pawel Moll <pawel.moll@arm.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/gpio/gpio-generic.c b/drivers/gpio/gpio-generic.c
index d2196bf738471fff1de061a2bbbeafee95b444f3..8c778afdf49f96e6f3e0094455bb60688eeed8a7 100644 (file)
--- a/drivers/gpio/gpio-generic.c
+++ b/drivers/gpio/gpio-generic.c
@@ -531,6 +531,8 @@ static int bgpio_pdev_probe(struct platform_device *pdev)
                return err;
 
        if (pdata) {
+               if (pdata->label)
+                       bgc->gc.label = pdata->label;
                bgc->gc.base = pdata->base;
                if (pdata->ngpio > 0)
                        bgc->gc.ngpio = pdata->ngpio;

diff --git a/include/linux/basic_mmio_gpio.h b/include/linux/basic_mmio_gpio.h
index d8a97ec0e2b8b16442a68343be5ee4af30efb718..0e97856b2cffafd8dc10218c95d2eae64169c17a 100644 (file)
--- a/include/linux/basic_mmio_gpio.h
+++ b/include/linux/basic_mmio_gpio.h
@@ -19,6 +19,7 @@
 #include <linux/spinlock_types.h>
 
 struct bgpio_pdata {
+       const char *label;
        int base;
        int ngpio;
 };