brcm63xx: add pinctrl support

[openwrt/staging/noltari.git] / target / linux / brcm63xx / patches-4.4 / 378-MIPS-BCM63XX-do-not-register-gpio-controller-if-pres.patch

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 af6eaff075a254c4f4c5387351bfff88aa0c88d7..6eb1bd02849c35e52045e1e3ae3763bd12b2f022 100644 (file)
--- 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));
  }