aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/mips/ath79/gpio.c4
-rw-r--r--arch/mips/include/asm/mach-ath79/ar71xx_regs.h1
2 files changed, 4 insertions, 1 deletions
diff --git a/arch/mips/ath79/gpio.c b/arch/mips/ath79/gpio.c
index b7ed207e94a1..8d025b028bb1 100644
--- a/arch/mips/ath79/gpio.c
+++ b/arch/mips/ath79/gpio.c
@@ -194,12 +194,14 @@ void __init ath79_gpio_init(void)
194 ath79_gpio_count = AR933X_GPIO_COUNT; 194 ath79_gpio_count = AR933X_GPIO_COUNT;
195 else if (soc_is_ar934x()) 195 else if (soc_is_ar934x())
196 ath79_gpio_count = AR934X_GPIO_COUNT; 196 ath79_gpio_count = AR934X_GPIO_COUNT;
197 else if (soc_is_qca955x())
198 ath79_gpio_count = QCA955X_GPIO_COUNT;
197 else 199 else
198 BUG(); 200 BUG();
199 201
200 ath79_gpio_base = ioremap_nocache(AR71XX_GPIO_BASE, AR71XX_GPIO_SIZE); 202 ath79_gpio_base = ioremap_nocache(AR71XX_GPIO_BASE, AR71XX_GPIO_SIZE);
201 ath79_gpio_chip.ngpio = ath79_gpio_count; 203 ath79_gpio_chip.ngpio = ath79_gpio_count;
202 if (soc_is_ar934x()) { 204 if (soc_is_ar934x() || soc_is_qca955x()) {
203 ath79_gpio_chip.direction_input = ar934x_gpio_direction_input; 205 ath79_gpio_chip.direction_input = ar934x_gpio_direction_input;
204 ath79_gpio_chip.direction_output = ar934x_gpio_direction_output; 206 ath79_gpio_chip.direction_output = ar934x_gpio_direction_output;
205 } 207 }
diff --git a/arch/mips/include/asm/mach-ath79/ar71xx_regs.h b/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
index 8782d8b097a3..4868ed5c149b 100644
--- a/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
+++ b/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
@@ -510,6 +510,7 @@
510#define AR913X_GPIO_COUNT 22 510#define AR913X_GPIO_COUNT 22
511#define AR933X_GPIO_COUNT 30 511#define AR933X_GPIO_COUNT 30
512#define AR934X_GPIO_COUNT 23 512#define AR934X_GPIO_COUNT 23
513#define QCA955X_GPIO_COUNT 24
513 514
514/* 515/*
515 * SRIF block 516 * SRIF block