aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm63xx/patches-4.4/378-MIPS-BCM63XX-do-not-register-gpio-controller-if-pres.patch
diff options
context:
space:
mode:
authorJonas Gorski <jonas.gorski@gmail.com>2016-07-01 11:23:06 +0200
committerJonas Gorski <jonas.gorski@gmail.com>2017-06-10 12:40:37 +0200
commit0755c2d117060a252674191b98bc852ccd8840fe (patch)
treee401b5b808066ea553fe9f5817378110ed91ffff /target/linux/brcm63xx/patches-4.4/378-MIPS-BCM63XX-do-not-register-gpio-controller-if-pres.patch
parentfd1096e351b7cfb0a7eb8bee7eceff52e7c7c499 (diff)
downloadupstream-0755c2d117060a252674191b98bc852ccd8840fe.tar.gz
upstream-0755c2d117060a252674191b98bc852ccd8840fe.tar.bz2
upstream-0755c2d117060a252674191b98bc852ccd8840fe.zip
brcm63xx: add pinctrl support
Add and enable pincontrol drivers, and update dts(i) files with appropriate hogs. Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
Diffstat (limited to 'target/linux/brcm63xx/patches-4.4/378-MIPS-BCM63XX-do-not-register-gpio-controller-if-pres.patch')
-rw-r--r--target/linux/brcm63xx/patches-4.4/378-MIPS-BCM63XX-do-not-register-gpio-controller-if-pres.patch5
1 files changed, 3 insertions, 2 deletions
diff --git a/target/linux/brcm63xx/patches-4.4/378-MIPS-BCM63XX-do-not-register-gpio-controller-if-pres.patch b/target/linux/brcm63xx/patches-4.4/378-MIPS-BCM63XX-do-not-register-gpio-controller-if-pres.patch
index af6eaff075..6eb1bd0284 100644
--- a/target/linux/brcm63xx/patches-4.4/378-MIPS-BCM63XX-do-not-register-gpio-controller-if-pres.patch
+++ b/target/linux/brcm63xx/patches-4.4/378-MIPS-BCM63XX-do-not-register-gpio-controller-if-pres.patch
@@ -20,13 +20,14 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
static const char * const gpio_chip_labels[] = {
"bcm63xx-gpio.0",
"bcm63xx-gpio.1",
-@@ -48,8 +50,9 @@ static void __init bcm63xx_gpio_init_one
+@@ -48,8 +50,10 @@ static void __init bcm63xx_gpio_init_one
pdata.base = id * 32;
pdata.ngpio = ngpio;
- platform_device_register_resndata(NULL, "bcm63xx-gpio", id, res, 2,
- &pdata, sizeof(pdata));
-+ if (!board_of_device_present("gpio0"))
++ if (!board_of_device_present("gpio0") &&
++ !board_of_device_present("pinctrl"))
+ platform_device_register_resndata(NULL, "bcm63xx-gpio", id, res,
+ 2, &pdata, sizeof(pdata));
}