ar71xx: Add support for ath79_gpio_function_* on QCA955X

[openwrt.git] / target / linux / ar71xx / patches-4.1 / 739-MIPS-ath79-add-gpio-func-register-for-QCA955x-SoC.patch

diff --git a/target/linux/ar71xx/patches-4.1/739-MIPS-ath79-add-gpio-func-register-for-QCA955x-SoC.patch b/target/linux/ar71xx/patches-4.1/739-MIPS-ath79-add-gpio-func-register-for-QCA955x-SoC.patch
index af828b0..eb30b44 100644 (file)
--- a/target/linux/ar71xx/patches-4.1/739-MIPS-ath79-add-gpio-func-register-for-QCA955x-SoC.patch
+++ b/target/linux/ar71xx/patches-4.1/739-MIPS-ath79-add-gpio-func-register-for-QCA955x-SoC.patch
@@ -1,6 +1,14 @@
 --- a/arch/mips/ath79/gpio.c
 +++ b/arch/mips/ath79/gpio.c
-@@ -185,15 +185,27 @@ 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;
@@ -9,16 +17,19 @@
 +      unsigned long gpio_count;
        u32 t, s;
  
--      BUG_ON(!soc_is_ar934x() && !soc_is_qca953x());
+-      BUG_ON(!soc_is_ar934x() && !soc_is_qca953x() && !soc_is_qca956x());
 +      if (soc_is_ar934x()) {
 +              gpio_count = AR934X_GPIO_COUNT;
 +              reg_base = AR934X_GPIO_REG_OUT_FUNC0;
 +      } else if (soc_is_qca953x()) {
-+              reg_base = QCA953X_GPIO_COUNT;
++              gpio_count = QCA953X_GPIO_COUNT;
 +              reg_base = QCA953X_GPIO_REG_OUT_FUNC0;
 +      } else if (soc_is_qca955x()) {
 +              gpio_count = QCA955X_GPIO_COUNT;
 +              reg_base = QCA955X_GPIO_REG_OUT_FUNC0;
++      } else if (soc_is_qca956x()) {
++              gpio_count = QCA956X_GPIO_COUNT;
++              reg_base = QCA956X_GPIO_REG_OUT_FUNC0;
 +      } else {
 +              BUG();
 +      }
@@ -34,7 +45,7 @@
        spin_lock_irqsave(&ath79_gpio_lock, flags);
 --- a/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
 +++ b/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
-@@ -868,6 +868,14 @@
+@@ -875,6 +875,14 @@
  #define QCA953X_GPIO_OUT_MUX_LED_LINK4                44
  #define QCA953X_GPIO_OUT_MUX_LED_LINK5                45
  
@@ -49,7 +60,7 @@
  #define QCA956X_GPIO_REG_OUT_FUNC0    0x2c
  #define QCA956X_GPIO_REG_OUT_FUNC1    0x30
  #define QCA956X_GPIO_REG_OUT_FUNC2    0x34
-@@ -1007,6 +1015,8 @@
+@@ -1014,6 +1022,8 @@
  #define AR934X_GPIO_OUT_EXT_LNA0      46
  #define AR934X_GPIO_OUT_EXT_LNA1      47