aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2011-12-14 20:47:24 +0000
committerFelix Fietkau <nbd@openwrt.org>2011-12-14 20:47:24 +0000
commit7076d74b21d73b7a18d00041f7e161d05f729bfd (patch)
treedb62412390577acc84cecab50f8dca0db670f4ea /target
parentb878f4a927e872889879d1bc49abc88ff6edb1ea (diff)
downloadupstream-7076d74b21d73b7a18d00041f7e161d05f729bfd.tar.gz
upstream-7076d74b21d73b7a18d00041f7e161d05f729bfd.tar.bz2
upstream-7076d74b21d73b7a18d00041f7e161d05f729bfd.zip
ar71xx: fix gpio count for ar7241/ar7242
SVN-Revision: 29532
Diffstat (limited to 'target')
-rw-r--r--target/linux/ar71xx/files/arch/mips/ar71xx/gpio.c5
-rw-r--r--target/linux/ar71xx/files/arch/mips/include/asm/mach-ar71xx/ar71xx.h3
2 files changed, 6 insertions, 2 deletions
diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/gpio.c b/target/linux/ar71xx/files/arch/mips/ar71xx/gpio.c
index 517a136a43..eca3b5b76a 100644
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/gpio.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/gpio.c
@@ -254,9 +254,12 @@ void __init ar71xx_gpio_init(void)
break;
case AR71XX_SOC_AR7240:
+ ar71xx_gpio_chip.ngpio = AR7240_GPIO_COUNT;
+ break;
+
case AR71XX_SOC_AR7241:
case AR71XX_SOC_AR7242:
- ar71xx_gpio_chip.ngpio = AR724X_GPIO_COUNT;
+ ar71xx_gpio_chip.ngpio = AR7241_GPIO_COUNT;
break;
case AR71XX_SOC_AR9130:
diff --git a/target/linux/ar71xx/files/arch/mips/include/asm/mach-ar71xx/ar71xx.h b/target/linux/ar71xx/files/arch/mips/include/asm/mach-ar71xx/ar71xx.h
index d9c5e87f3f..6ff886134c 100644
--- a/target/linux/ar71xx/files/arch/mips/include/asm/mach-ar71xx/ar71xx.h
+++ b/target/linux/ar71xx/files/arch/mips/include/asm/mach-ar71xx/ar71xx.h
@@ -466,7 +466,8 @@ static inline u32 ar71xx_usb_ctrl_rr(unsigned reg)
#define AR724X_GPIO_FUNC_UART_EN BIT(1)
#define AR724X_GPIO_FUNC_JTAG_DISABLE BIT(0)
-#define AR724X_GPIO_COUNT 18
+#define AR7240_GPIO_COUNT 18
+#define AR7241_GPIO_COUNT 20
#define AR91XX_GPIO_FUNC_WMAC_LED_EN BIT(22)
#define AR91XX_GPIO_FUNC_EXP_PORT_CS_EN BIT(21)