use the correct number of GPIOs for bcm6358

SVN-Revision: 16329

diff --git a/target/linux/brcm63xx/files/arch/mips/bcm63xx/gpio.c b/target/linux/brcm63xx/files/arch/mips/bcm63xx/gpio.c
index 997fcaa439ba3f14310b0b31db9e12acf32f6647..97e3730c3470703186696a084f7941a2d9270603 100644 (file)
--- a/target/linux/brcm63xx/files/arch/mips/bcm63xx/gpio.c
+++ b/target/linux/brcm63xx/files/arch/mips/bcm63xx/gpio.c
@@ -117,11 +117,11 @@ static struct gpio_chip bcm63xx_gpio_chip = {
        .get                    = bcm63xx_gpio_get,
        .set                    = bcm63xx_gpio_set,
        .base                   = 0,
-       .ngpio                  = BCM63XX_GPIO_COUNT,
 };
 
 int __init bcm63xx_gpio_init(void)
 {
-       printk(KERN_INFO "registering %d GPIOs\n", BCM63XX_GPIO_COUNT);
+       bcm63xx_gpio_chip.ngpio = bcm63xx_gpio_count();
+       printk(KERN_INFO "registering %d GPIOs\n", bcm63xx_gpio_chip.ngpio);
        return gpiochip_add(&bcm63xx_gpio_chip);
 }

diff --git a/target/linux/brcm63xx/files/include/asm-mips/mach-bcm63xx/bcm63xx_gpio.h b/target/linux/brcm63xx/files/include/asm-mips/mach-bcm63xx/bcm63xx_gpio.h
index 7f5d8e87d0f4e35d51f79e78877d1ca99a4b6420..76a0b7216af576ea868e3c3f245c7329a5b2a1b6 100644 (file)
--- a/target/linux/brcm63xx/files/include/asm-mips/mach-bcm63xx/bcm63xx_gpio.h
+++ b/target/linux/brcm63xx/files/include/asm-mips/mach-bcm63xx/bcm63xx_gpio.h
@@ -5,8 +5,16 @@
 
 int __init bcm63xx_gpio_init(void);
 
-/* all helpers will BUG() if gpio count is >= 37. */
-#define BCM63XX_GPIO_COUNT     37
+static inline unsigned long bcm63xx_gpio_count(void)
+{
+       switch (bcm63xx_get_cpu_id()) {
+       case BCM6358_CPU_ID:
+               return 40;
+       case BCM6348_CPU_ID:
+       default:
+               return 37;
+       }
+}
 
 #define GPIO_DIR_OUT   0x0
 #define GPIO_DIR_IN    0x1

diff --git a/target/linux/brcm63xx/files/include/asm-mips/mach-bcm63xx/gpio.h b/target/linux/brcm63xx/files/include/asm-mips/mach-bcm63xx/gpio.h
index 033c997afcc00ce7da136890478ee53687b09953..7cda8c0a39794a05f400093daaf17b18571b2fef 100644 (file)
--- a/target/linux/brcm63xx/files/include/asm-mips/mach-bcm63xx/gpio.h
+++ b/target/linux/brcm63xx/files/include/asm-mips/mach-bcm63xx/gpio.h
@@ -3,8 +3,6 @@
 
 #include <bcm63xx_gpio.h>
 
-#define NR_BUILTIN_GPIO                BCM63XX_GPIO_COUNT
-
 #define gpio_to_irq(gpio)      NULL
 
 #define gpio_get_value __gpio_get_value