summaryrefslogtreecommitdiff
path: root/arch/mips/ath79/gpio.c
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-09-06 03:27:00 +0400
committerOlof Johansson <olof@lixom.net>2012-09-06 03:27:00 +0400
commit402efdb48d6a6aef9e91e3112a94b679d787fef7 (patch)
tree69ed39eb1c02fd40e4a2f807f4057e18de6ac13c /arch/mips/ath79/gpio.c
parent1875962377574b4edb7b164001e3e341c25290d5 (diff)
parent056876f6c73406c06d530d16d020177f5ec4a0bd (diff)
downloadlinux-402efdb48d6a6aef9e91e3112a94b679d787fef7.tar.xz
Merge branch 'pinmux-dt' of git://gitorious.org/sirfprima2-kernel/sirfprima2-kernel into next/dt
This branch enables device tree bindings for the CSR Prima pin control subsystem. All patches acked by Linus W (pinctrl maintainer). * 'pinmux-dt' of git://gitorious.org/sirfprima2-kernel/sirfprima2-kernel: pinctrl: sirf: add DT-binding pinmux mapping support ARM: PRIMA2: rename prima2-cb.dts to prima2.dtsi as it only has SoC features ARM: PRIMA2: add missing interrupts property for pinctrl node + sync to Linux 3.6-rc4
Diffstat (limited to 'arch/mips/ath79/gpio.c')
-rw-r--r--arch/mips/ath79/gpio.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/mips/ath79/gpio.c b/arch/mips/ath79/gpio.c
index 29054f211832..48fe762d2526 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())