From e31d7bf56e430ad9c10b17c03f453e5dec6287aa Mon Sep 17 00:00:00 2001
From: Gabor Juhos <juhosg@openwrt.org>
Date: Fri, 15 Feb 2013 13:38:19 +0000
Subject: [PATCH] --- yaml --- r: 360101 b: refs/heads/master c:
 f818ca3e6894d4a630a1ecc673c91df8fb6f6898 h: refs/heads/master i:   360099:
 fc113d9c0dd0ca20cd5dc4a6d0753917c2e9bf6f v: v3

---
 [refs]                                               | 2 +-
 trunk/arch/mips/ath79/gpio.c                         | 4 +++-
 trunk/arch/mips/include/asm/mach-ath79/ar71xx_regs.h | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e91c3d42b2b3..8116bb574a9a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 53330332f176eaa9567481c69bbad8b2176b4eb5
+refs/heads/master: f818ca3e6894d4a630a1ecc673c91df8fb6f6898
diff --git a/trunk/arch/mips/ath79/gpio.c b/trunk/arch/mips/ath79/gpio.c
index b7ed207e94a1..8d025b028bb1 100644
--- a/trunk/arch/mips/ath79/gpio.c
+++ b/trunk/arch/mips/ath79/gpio.c
@@ -194,12 +194,14 @@ void __init ath79_gpio_init(void)
 		ath79_gpio_count = AR933X_GPIO_COUNT;
 	else if (soc_is_ar934x())
 		ath79_gpio_count = AR934X_GPIO_COUNT;
+	else if (soc_is_qca955x())
+		ath79_gpio_count = QCA955X_GPIO_COUNT;
 	else
 		BUG();
 
 	ath79_gpio_base = ioremap_nocache(AR71XX_GPIO_BASE, AR71XX_GPIO_SIZE);
 	ath79_gpio_chip.ngpio = ath79_gpio_count;
-	if (soc_is_ar934x()) {
+	if (soc_is_ar934x() || soc_is_qca955x()) {
 		ath79_gpio_chip.direction_input = ar934x_gpio_direction_input;
 		ath79_gpio_chip.direction_output = ar934x_gpio_direction_output;
 	}
diff --git a/trunk/arch/mips/include/asm/mach-ath79/ar71xx_regs.h b/trunk/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
index 8782d8b097a3..4868ed5c149b 100644
--- a/trunk/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
+++ b/trunk/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
@@ -510,6 +510,7 @@
 #define AR913X_GPIO_COUNT		22
 #define AR933X_GPIO_COUNT		30
 #define AR934X_GPIO_COUNT		23
+#define QCA955X_GPIO_COUNT		24
 
 /*
  * SRIF block