target/linux/brcm63xx/patches-3.14/378-MIPS-BCM63XX-do-not-register-gpio-controller-if-pres.patch

   1 From e55892aac9d5508a000647ca66f0e678e02be3bb Mon Sep 17 00:00:00 2001
   2 From: Jonas Gorski <jogo@openwrt.org>
   3 Date: Sat, 21 Feb 2015 17:26:50 +0100
   4 Subject: [PATCH 5/6] MIPS: BCM63XX: do not register gpio-controller if
   5 present in dtb
   6
   7 Signed-off-by: Jonas Gorski <jogo@openwrt.org>
   8 ---
   9  arch/mips/bcm63xx/gpio.c |   7 +++++--
  10  1 file changed, 5 insertions(+), 2 deletions(-)
  11
  12 --- a/arch/mips/bcm63xx/gpio.c
  13 +++ b/arch/mips/bcm63xx/gpio.c
  14 @@ -20,6 +20,8 @@
  15  #include <bcm63xx_gpio.h>
  16  #include <bcm63xx_regs.h>
  17
  18 +#include "boards/board_common.h"
  19 +
  20  /* for registering lookups; make them large enough to hold OF names */
  21  static char *gpio_chip_labels[] = {
  22         "xxxxxxxx.gpio-controller",
  23 @@ -50,8 +52,9 @@ static void __init bcm63xx_gpio_init_one
  24         pdata.ngpio = ngpio;
  25
  26         sprintf(gpio_chip_labels[id], "bcm63xx-gpio.%d", id);
  27 -       platform_device_register_resndata(NULL, "bcm63xx-gpio", id, res, 2,
  28 -                                         &pdata, sizeof(pdata));
  29 +       if (!board_of_device_present("gpio0"))
  30 +               platform_device_register_resndata(NULL, "bcm63xx-gpio", id, res,
  31 +                                                 2, &pdata, sizeof(pdata));
  32  }
  33
  34  int __init bcm63xx_gpio_init(void)