kernel: bump to 3.18.84

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

diff --git a/target/linux/ar71xx/patches-3.18/739-MIPS-ath79-add-gpio-func-register-for-QCA955x-SoC.patch b/target/linux/ar71xx/patches-3.18/739-MIPS-ath79-add-gpio-func-register-for-QCA955x-SoC.patch
index 24ce7d8..a36b8c3 100644 (file)
--- a/target/linux/ar71xx/patches-3.18/739-MIPS-ath79-add-gpio-func-register-for-QCA955x-SoC.patch
+++ b/target/linux/ar71xx/patches-3.18/739-MIPS-ath79-add-gpio-func-register-for-QCA955x-SoC.patch
@@ -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;
@@ -32,29 +42,3 @@
        s = 8 * (gpio % 4);
  
        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 @@
- #define QCA953X_GPIO_OUT_MUX_LED_LINK4                44
- #define QCA953X_GPIO_OUT_MUX_LED_LINK5                45
- 
-+#define QCA955X_GPIO_REG_OUT_FUNC0    0x2c
-+#define QCA955X_GPIO_REG_OUT_FUNC1    0x30
-+#define QCA955X_GPIO_REG_OUT_FUNC2    0x34
-+#define QCA955X_GPIO_REG_OUT_FUNC3    0x38
-+#define QCA955X_GPIO_REG_OUT_FUNC4    0x3c
-+#define QCA955X_GPIO_REG_OUT_FUNC5    0x40
-+#define QCA955X_GPIO_REG_FUNC         0x6c
-+
- #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 @@
- #define AR934X_GPIO_OUT_EXT_LNA0      46
- #define AR934X_GPIO_OUT_EXT_LNA1      47
- 
-+#define QCA955X_GPIO_OUT_GPIO         0
-+
- /*
-  * MII_CTRL block
-  */