kernel: mac80211: fold the AR9280 GPIO patch into the ath9k GPIO patch

[openwrt/openwrt.git] / package / kernel / mac80211 / patches / 548-ath9k_enable_gpio_chip.patch

diff --git a/package/kernel/mac80211/patches/548-ath9k_enable_gpio_chip.patch b/package/kernel/mac80211/patches/548-ath9k_enable_gpio_chip.patch
index f91d85c6f8939e0fd16822ef317a30d6c94952f1..031be09d3bf54919c56a42ff4188c36663b35422 100644 (file)
--- a/package/kernel/mac80211/patches/548-ath9k_enable_gpio_chip.patch
+++ b/package/kernel/mac80211/patches/548-ath9k_enable_gpio_chip.patch
@@ -6,7 +6,7 @@ Enable access to GPIO chip and its pins for Atheros AR92xx
 wireless devices. For now AR9285 and AR9287 are supported.
 
 Signed-off-by: Michal Cieslakiewicz <michal.cieslakiewicz@wp.pl>
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
 ---
 --- a/drivers/net/wireless/ath/ath9k/ath9k.h
 +++ b/drivers/net/wireless/ath/ath9k/ath9k.h
@@ -18,7 +18,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
  
  #include "common.h"
  #include "debug.h"
-@@ -963,6 +964,14 @@ struct ath_led {
+@@ -959,6 +960,14 @@ struct ath_led {
        struct led_classdev cdev;
  };
  
@@ -33,7 +33,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
  struct ath_softc {
        struct ieee80211_hw *hw;
        struct device *dev;
-@@ -1017,6 +1026,9 @@ struct ath_softc {
+@@ -1013,6 +1022,9 @@ struct ath_softc {
  #ifdef CPTCFG_MAC80211_LEDS
        const char *led_default_trigger;
        struct list_head leds;
@@ -45,7 +45,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
  #ifdef CPTCFG_ATH9K_DEBUGFS
 --- a/drivers/net/wireless/ath/ath9k/gpio.c
 +++ b/drivers/net/wireless/ath/ath9k/gpio.c
-@@ -16,12 +16,138 @@
+@@ -16,13 +16,140 @@
  
  #include "ath9k.h"
  #include <linux/ath9k_platform.h>
@@ -65,7 +65,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
 +      struct ath9k_gpio_chip *gc = container_of(chip, struct ath9k_gpio_chip,
 +                                                gchip);
 +
-+      ath9k_hw_cfg_gpio_input(gc->sc->sc_ah, offset);
++      ath9k_hw_gpio_request_in(gc->sc->sc_ah, offset, "ath9k-gpio");
 +
 +      return 0;
 +}
@@ -77,8 +77,8 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
 +      struct ath9k_gpio_chip *gc = container_of(chip, struct ath9k_gpio_chip,
 +                                                gchip);
 +
-+      ath9k_hw_cfg_output(gc->sc->sc_ah, offset,
-+                          AR_GPIO_OUTPUT_MUX_AS_OUTPUT);
++      ath9k_hw_gpio_request_out(gc->sc->sc_ah, offset, "ath9k-gpio",
++                                AR_GPIO_OUTPUT_MUX_AS_OUTPUT);
 +      ath9k_hw_set_gpio(gc->sc->sc_ah, offset, value);
 +
 +      return 0;
@@ -119,11 +119,13 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
 +      struct ath9k_gpio_chip *gc;
 +      u16 ng;
 +
-+      /* for now only AR9285 and AR9287 are recognized */
++      /* supported chips are AR9280, AR9285 and AR9287 */
 +      if (AR_SREV_9287(sc->sc_ah))
 +              ng = AR9287_NUM_GPIO;
 +      else if (AR_SREV_9285(sc->sc_ah))
 +              ng = AR9285_NUM_GPIO;
++      else if (AR_SREV_9280(sc->sc_ah))
++              ng = AR9280_NUM_GPIO;
 +      else
 +              return;
 +
@@ -182,10 +184,11 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
  /********************************/
  
 -#ifdef CPTCFG_MAC80211_LEDS
- static void ath_led_brightness(struct led_classdev *led_cdev,
-                              enum led_brightness brightness)
+-
+ static void ath_fill_led_pin(struct ath_softc *sc)
  {
-@@ -60,6 +186,12 @@ static int ath_add_led(struct ath_softc
+       struct ath_hw *ah = sc->sc_ah;
+@@ -80,6 +207,12 @@ static int ath_add_led(struct ath_softc
        else
                ath9k_hw_set_gpio(sc->sc_ah, gpio->gpio, gpio->active_low);
  
@@ -198,7 +201,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
        return 0;
  }
  
-@@ -116,11 +248,17 @@ void ath_deinit_leds(struct ath_softc *s
+@@ -136,12 +269,18 @@ void ath_deinit_leds(struct ath_softc *s
  
        while (!list_empty(&sc->leds)) {
                led = list_first_entry(&sc->leds, struct ath_led, list);
@@ -210,24 +213,25 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
                list_del(&led->list);
                ath_led_brightness(&led->cdev, LED_OFF);
                led_classdev_unregister(&led->cdev);
+               ath9k_hw_gpio_free(sc->sc_ah, led->gpio->gpio);
                kfree(led);
        }
 +      ath9k_unregister_gpio_chip(sc);
  }
  
  void ath_init_leds(struct ath_softc *sc)
-@@ -135,6 +273,8 @@ void ath_init_leds(struct ath_softc *sc)
-       if (AR_SREV_9100(sc->sc_ah))
-               return;
+@@ -158,6 +297,8 @@ void ath_init_leds(struct ath_softc *sc)
+ 
+       ath_fill_led_pin(sc);
  
 +      ath9k_register_gpio_chip(sc);
 +
        if (pdata && pdata->led_name)
                strncpy(led_name, pdata->led_name, sizeof(led_name));
        else
-@@ -186,6 +326,7 @@ void ath_fill_led_pin(struct ath_softc *
-       /* LED off, active low */
-       ath9k_hw_set_gpio(ah, ah->led_pin, (ah->config.led_active_high) ? 0 : 1);
+@@ -178,6 +319,7 @@ void ath_init_leds(struct ath_softc *sc)
+       for (i = 0; i < pdata->num_leds; i++)
+               ath_create_platform_led(sc, &pdata->leds[i]);
  }
 +
  #endif