diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2015-03-16 13:37:38 +0000 |
|---|---|---|
| committer | Jonas Gorski <jogo@openwrt.org> | 2015-03-16 13:37:38 +0000 |
| commit | 343ec8d6452059e3f45f74acfc9ae26cae26446a (patch) | |
| tree | dffec8cc466ac9b1a0bc7936bc866fa3cd5573fe /target/linux/brcm63xx/patches-3.18/374-gpio-add-a-simple-GPIO-driver-for-bcm63xx.patch | |
| parent | e1a8e41287337b9cccd7758ee5d0372d6ebc3210 (diff) | |
| download | upstream-343ec8d6452059e3f45f74acfc9ae26cae26446a.tar.gz upstream-343ec8d6452059e3f45f74acfc9ae26cae26446a.tar.bz2 upstream-343ec8d6452059e3f45f74acfc9ae26cae26446a.zip | |
brcm63xx: use consistent gpio chip labeling for OF/non-OF
Ensure gpio chips are always labeled the same; this allows simplifying
any arch setup gpio lookups.
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 44846
Diffstat (limited to 'target/linux/brcm63xx/patches-3.18/374-gpio-add-a-simple-GPIO-driver-for-bcm63xx.patch')
| -rw-r--r-- | target/linux/brcm63xx/patches-3.18/374-gpio-add-a-simple-GPIO-driver-for-bcm63xx.patch | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/target/linux/brcm63xx/patches-3.18/374-gpio-add-a-simple-GPIO-driver-for-bcm63xx.patch b/target/linux/brcm63xx/patches-3.18/374-gpio-add-a-simple-GPIO-driver-for-bcm63xx.patch index 53fcb8a3f5..3e53c80606 100644 --- a/target/linux/brcm63xx/patches-3.18/374-gpio-add-a-simple-GPIO-driver-for-bcm63xx.patch +++ b/target/linux/brcm63xx/patches-3.18/374-gpio-add-a-simple-GPIO-driver-for-bcm63xx.patch @@ -8,8 +8,8 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> --- drivers/gpio/Kconfig | 8 +++ drivers/gpio/Makefile | 1 + - drivers/gpio/gpio-bcm63xx.c | 117 +++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 126 insertions(+) + drivers/gpio/gpio-bcm63xx.c | 122 +++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 131 insertions(+) create mode 100644 drivers/gpio/gpio-bcm63xx.c --- a/drivers/gpio/Kconfig @@ -41,7 +41,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> obj-$(CONFIG_GPIO_CS5535) += gpio-cs5535.o --- /dev/null +++ b/drivers/gpio/gpio-bcm63xx.c -@@ -0,0 +1,117 @@ +@@ -0,0 +1,122 @@ +/* + * Driver for BCM63XX memory-mapped GPIO controllers, based on + * Generic driver for memory-mapped GPIO controllers. @@ -117,8 +117,13 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> + platform_set_drvdata(pdev, bgc); + + if (dev->of_node) { ++ int id = of_alias_get_id(dev->of_node, "gpio"); + u32 ngpios; + ++ if (id >= 0) ++ bgc->gc.label = devm_kasprintf(dev, GFP_KERNEL, ++ "bcm63xx-gpio.%d", id); ++ + if (!of_property_read_u32(dev->of_node, "ngpios", &ngpios)) + bgc->gc.ngpio = ngpios; + |