From 1208ffaedb5e7472a15427dd91ae237146305ab5 Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Thu, 4 Jun 2009 10:01:03 +0000 Subject: use the correct number of GPIOs for bcm6358 SVN-Revision: 16329 --- .../files/include/asm-mips/mach-bcm63xx/bcm63xx_gpio.h | 12 ++++++++++-- .../brcm63xx/files/include/asm-mips/mach-bcm63xx/gpio.h | 2 -- 2 files changed, 10 insertions(+), 4 deletions(-) (limited to 'target/linux/brcm63xx/files/include') 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 7f5d8e8..76a0b72 100644 --- 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 033c997..7cda8c0 100644 --- 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 -#define NR_BUILTIN_GPIO BCM63XX_GPIO_COUNT - #define gpio_to_irq(gpio) NULL #define gpio_get_value __gpio_get_value -- cgit v1.1