ar71xx: Add support for ath79_gpio_function_* on QCA955X
authorSven Eckelmann <sven.eckelmann@open-mesh.com>
Thu, 19 May 2016 18:20:55 +0000 (20:20 +0200)
committerSven Eckelmann <sven@narfation.org>
Wed, 21 Sep 2016 16:16:54 +0000 (18:16 +0200)
Signed-off-by: Sven Eckelmann <sven.eckelmann@open-mesh.com>
Backport of r49074

target/linux/ar71xx/patches-3.18/739-MIPS-ath79-add-gpio-func-register-for-QCA955x-SoC.patch

index 24ce7d8..076a4a1 100644 (file)
@@ -1,6 +1,16 @@
 --- a/arch/mips/ath79/gpio.c
 +++ b/arch/mips/ath79/gpio.c
-@@ -185,15 +185,27 @@ void __init ath79_gpio_output_select(uns
+@@ -146,7 +146,8 @@ static void __iomem *ath79_gpio_get_func
+       if (soc_is_ar71xx() ||
+           soc_is_ar724x() ||
+           soc_is_ar913x() ||
+-          soc_is_ar933x())
++          soc_is_ar933x() ||
++          soc_is_qca955x())
+               reg = AR71XX_GPIO_REG_FUNC;
+       else if (soc_is_ar934x() ||
+                soc_is_qca953x() || soc_is_qca956x())
+@@ -185,15 +186,27 @@ void __init ath79_gpio_output_select(uns
  {
        void __iomem *base = ath79_gpio_base;
        unsigned long flags;