From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 14 Dec 2011 20:47:24 +0000 (+0000)
Subject: ar71xx: fix gpio count for ar7241/ar7242
X-Git-Url: https://git.rohieb.name/openwrt.git/commitdiff_plain/5841748e56b43bc427876692b728871993d5bdff

ar71xx: fix gpio count for ar7241/ar7242

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29532 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/gpio.c b/target/linux/ar71xx/files/arch/mips/ar71xx/gpio.c
index 517a136a4..eca3b5b76 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 d9c5e87f3..6ff886134 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)