ar71xx: Add support for ath79_gpio_function_* on QCA955X
authorJohn Crispin <john@openwrt.org>
Wed, 23 Mar 2016 12:52:27 +0000 (12:52 +0000)
committerJohn Crispin <john@openwrt.org>
Wed, 23 Mar 2016 12:52:27 +0000 (12:52 +0000)
Signed-off-by: Sven Eckelmann <sven.eckelmann@open-mesh.com>
SVN-Revision: 49074

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

index 9de1ec4..eb30b44 100644 (file)
@@ -1,6 +1,14 @@
 --- a/arch/mips/ath79/gpio.c
 +++ b/arch/mips/ath79/gpio.c
-@@ -223,15 +223,30 @@ void __init ath79_gpio_output_select(uns
+@@ -186,6 +186,7 @@ static void __iomem *ath79_gpio_get_func
+               reg = AR71XX_GPIO_REG_FUNC;
+       else if (soc_is_ar934x() ||
+                soc_is_qca953x() ||
++               soc_is_qca955x() ||
+                soc_is_qca956x() ||
+                soc_is_tp9343())
+               reg = AR934X_GPIO_REG_FUNC;
+@@ -223,15 +224,30 @@ void __init ath79_gpio_output_select(uns
  {
        void __iomem *base = ath79_gpio_base;
        unsigned long flags;
index a54c12b..4ea67fd 100644 (file)
@@ -1,6 +1,14 @@
 --- a/arch/mips/ath79/gpio.c
 +++ b/arch/mips/ath79/gpio.c
-@@ -64,15 +64,21 @@ void ath79_gpio_function_disable(u32 mas
+@@ -33,6 +33,7 @@ static void __iomem *ath79_gpio_get_func
+               reg = AR71XX_GPIO_REG_FUNC;
+       else if (soc_is_ar934x() ||
+                soc_is_qca953x() ||
++               soc_is_qca955x() ||
+                soc_is_qca956x() ||
+                soc_is_tp9343())
+               reg = AR934X_GPIO_REG_FUNC;
+@@ -64,15 +65,21 @@ void ath79_gpio_function_disable(u32 mas
  void __init ath79_gpio_output_select(unsigned gpio, u8 val)
  {
        void __iomem *base = ath79_gpio_base;
@@ -9,6 +17,9 @@
        u32 t, s;
  
 -      BUG_ON(!soc_is_ar934x() && !soc_is_qca953x() && !soc_is_qca956x());
+-
+-      if (gpio >= AR934X_GPIO_COUNT)
+-              return;
 +      if (soc_is_ar934x())
 +              reg_base = AR934X_GPIO_REG_OUT_FUNC0;
 +      else if (soc_is_qca953x())
@@ -20,9 +31,6 @@
 +      else
 +              BUG();
  
--      if (gpio >= AR934X_GPIO_COUNT)
--              return;
--
 -      reg = AR934X_GPIO_REG_OUT_FUNC0 + 4 * (gpio / 4);
 +      reg = reg_base + 4 * (gpio / 4);
        s = 8 * (gpio % 4);