| To: | Ralf Baechle <ralf@linux-mips.org> |
|---|---|
| Subject: | [PATCH v3 1/4] MIPS: ath79: fix number of GPIO lines for AR724[12] |
| From: | Gabor Juhos <juhosg@openwrt.org> |
| Date: | Sat, 4 Aug 2012 18:01:24 +0200 |
| Cc: | linux-mips@linux-mips.org, Gabor Juhos <juhosg@openwrt.org> |
| In-reply-to: | <1344096087-25044-1-git-send-email-juhosg@openwrt.org> |
| List-archive: | <http://www.linux-mips.org/archives/linux-mips/> |
| List-help: | <mailto:ecartis@linux-mips.org?Subject=help> |
| List-id: | linux-mips <linux-mips.eddie.linux-mips.org> |
| List-owner: | <mailto:ralf@linux-mips.org> |
| List-post: | <mailto:linux-mips@linux-mips.org> |
| List-software: | Ecartis version 1.0.0 |
| List-subscribe: | <mailto:ecartis@linux-mips.org?subject=subscribe%20linux-mips> |
| List-unsubscribe: | <mailto:ecartis@linux-mips.org?subject=unsubscribe%20linux-mips> |
| References: | <1344096087-25044-1-git-send-email-juhosg@openwrt.org> |
| Sender: | linux-mips-bounce@linux-mips.org |
The AR724[12] SoCs have more GPIO lines than the AR7240.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
---
arch/mips/ath79/gpio.c | 6 ++++--
arch/mips/include/asm/mach-ath79/ar71xx_regs.h | 3 ++-
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/arch/mips/ath79/gpio.c b/arch/mips/ath79/gpio.c
index 29054f2..48fe762 100644
--- a/arch/mips/ath79/gpio.c
+++ b/arch/mips/ath79/gpio.c
@@ -188,8 +188,10 @@ void __init ath79_gpio_init(void)
if (soc_is_ar71xx())
ath79_gpio_count = AR71XX_GPIO_COUNT;
- else if (soc_is_ar724x())
- ath79_gpio_count = AR724X_GPIO_COUNT;
+ else if (soc_is_ar7240())
+ ath79_gpio_count = AR7240_GPIO_COUNT;
+ else if (soc_is_ar7241() || soc_is_ar7242())
+ ath79_gpio_count = AR7241_GPIO_COUNT;
else if (soc_is_ar913x())
ath79_gpio_count = AR913X_GPIO_COUNT;
else if (soc_is_ar933x())
diff --git a/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
b/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
index 1caa78a..dde5044 100644
--- a/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
+++ b/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
@@ -393,7 +393,8 @@
#define AR71XX_GPIO_REG_FUNC 0x28
#define AR71XX_GPIO_COUNT 16
-#define AR724X_GPIO_COUNT 18
+#define AR7240_GPIO_COUNT 18
+#define AR7241_GPIO_COUNT 20
#define AR913X_GPIO_COUNT 22
#define AR933X_GPIO_COUNT 30
#define AR934X_GPIO_COUNT 23
--
1.7.10
|
| <Prev in Thread] | Current Thread | [Next in Thread> |
|---|---|---|
| ||
| Previous by Date: | [PATCH v3 0/4] MIPS: ath79: various fixes, Gabor Juhos |
|---|---|
| Next by Date: | [PATCH v3 2/4] MIPS: ath79: use correct IRQ number for the OHCI controller on AR7240, Gabor Juhos |
| Previous by Thread: | [PATCH v3 0/4] MIPS: ath79: various fixes, Gabor Juhos |
| Next by Thread: | Re: [PATCH v3 1/4] MIPS: ath79: fix number of GPIO lines for AR724[12], Ralf Baechle |
| Indexes: | [Date] [Thread] [Top] [All Lists] |