From 343ec8d6452059e3f45f74acfc9ae26cae26446a Mon Sep 17 00:00:00 2001 From: Jonas Gorski Date: Mon, 16 Mar 2015 13:37:38 +0000 Subject: 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 SVN-Revision: 44846 --- .../374-gpio-add-a-simple-GPIO-driver-for-bcm63xx.patch | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'target/linux/brcm63xx/patches-3.14/374-gpio-add-a-simple-GPIO-driver-for-bcm63xx.patch') diff --git a/target/linux/brcm63xx/patches-3.14/374-gpio-add-a-simple-GPIO-driver-for-bcm63xx.patch b/target/linux/brcm63xx/patches-3.14/374-gpio-add-a-simple-GPIO-driver-for-bcm63xx.patch index 2a07e735ca..6f74d027f9 100644 --- a/target/linux/brcm63xx/patches-3.14/374-gpio-add-a-simple-GPIO-driver-for-bcm63xx.patch +++ b/target/linux/brcm63xx/patches-3.14/374-gpio-add-a-simple-GPIO-driver-for-bcm63xx.patch @@ -8,8 +8,8 @@ Signed-off-by: Jonas Gorski --- 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 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 + 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; + -- cgit v1.2.3