1 --- a/arch/mips/ath79/gpio.c
2 +++ b/arch/mips/ath79/gpio.c
3 @@ -146,7 +146,8 @@ static void __iomem *ath79_gpio_get_func
10 reg = AR71XX_GPIO_REG_FUNC;
11 else if (soc_is_ar934x() ||
12 soc_is_qca953x() || soc_is_qca956x())
13 @@ -185,15 +186,27 @@ void __init ath79_gpio_output_select(uns
15 void __iomem *base = ath79_gpio_base;
18 + unsigned int reg, reg_base;
19 + unsigned long gpio_count;
22 - BUG_ON(!soc_is_ar934x() && !soc_is_qca953x());
23 + if (soc_is_ar934x()) {
24 + gpio_count = AR934X_GPIO_COUNT;
25 + reg_base = AR934X_GPIO_REG_OUT_FUNC0;
26 + } else if (soc_is_qca953x()) {
27 + gpio_count = QCA953X_GPIO_COUNT;
28 + reg_base = QCA953X_GPIO_REG_OUT_FUNC0;
29 + } else if (soc_is_qca955x()) {
30 + gpio_count = QCA955X_GPIO_COUNT;
31 + reg_base = QCA955X_GPIO_REG_OUT_FUNC0;
36 - if (gpio >= AR934X_GPIO_COUNT)
37 + if (gpio >= gpio_count)
40 - reg = AR934X_GPIO_REG_OUT_FUNC0 + 4 * (gpio / 4);
41 + reg = reg_base + 4 * (gpio / 4);
44 spin_lock_irqsave(&ath79_gpio_lock, flags);