diff options
| author |   Pawel Moll <pawel.moll@arm.com> | 2014-01-30 13:18:57 +0000 |
|---|---|---|
| committer |   Linus Walleij <linus.walleij@linaro.org> | 2014-02-06 10:33:47 +0100 |
| commit | 781f6d710d4482eab05cfaad50060a0ea8c0e4e0 (patch) | |
| tree | b4ebc7c5d301d7a1e759de71af9f7fdd11d870c9 | |
| parent | gpio: bcm281xx: Use "unsigned gpio" consistently throughout the code (diff) | |
| download | linux-dev-781f6d710d4482eab05cfaad50060a0ea8c0e4e0.tar.xz linux-dev-781f6d710d4482eab05cfaad50060a0ea8c0e4e0.zip | |
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>
| -rw-r--r-- | drivers/gpio/gpio-generic.c | 2 | ||||
| -rw-r--r-- | include/linux/basic_mmio_gpio.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpio/gpio-generic.c b/drivers/gpio/gpio-generic.c index d2196bf73847..8c778afdf49f 100644 --- 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 d8a97ec0e2b8..0e97856b2cff 100644 --- 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; }; |