ath9k: unset the default LED pin if used by platform leds

[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 2a1cfffc14f89a27f550f234a58f902a970df7ae..4e28abbc3522582ef1f27136c3056f3d2e11186e 100644 (file)
--- a/package/kernel/mac80211/patches/548-ath9k_enable_gpio_chip.patch
+++ b/package/kernel/mac80211/patches/548-ath9k_enable_gpio_chip.patch
@@ -18,7 +18,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  
  #include "common.h"
  #include "debug.h"
-@@ -960,6 +961,14 @@ struct ath_led {
+@@ -1001,6 +1002,14 @@ struct ath_led {
        struct led_classdev cdev;
  };
  
@@ -33,7 +33,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  struct ath_softc {
        struct ieee80211_hw *hw;
        struct device *dev;
-@@ -1014,6 +1023,9 @@ struct ath_softc {
+@@ -1058,6 +1067,9 @@ struct ath_softc {
  #ifdef CPTCFG_MAC80211_LEDS
        const char *led_default_trigger;
        struct list_head leds;
@@ -123,6 +123,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 +      if (!gc)
 +              return;
 +
++      gc->sc = sc;
 +      snprintf(gc->label, sizeof(gc->label), "ath9k-%s",
 +               wiphy_name(sc->hw->wiphy));
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,5,0)
@@ -138,15 +139,14 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 +      gc->gchip.get_direction = ath9k_gpio_pin_get_dir;
 +      gc->gchip.get = ath9k_gpio_pin_get;
 +      gc->gchip.set = ath9k_gpio_pin_set;
-+      gc->gchip.owner = THIS_MODULE;
 +
 +      if (gpiochip_add(&gc->gchip)) {
 +              kfree(gc);
 +              return;
 +      }
 +
++      gc->gchip.owner = NULL;
 +      sc->gpiochip = gc;
-+      gc->sc = sc;
 +}
 +
 +/* remove GPIO chip */
@@ -221,12 +221,12 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  
 +      ath9k_register_gpio_chip(sc);
 +
-       if (pdata && pdata->led_name)
-               strncpy(led_name, pdata->led_name, sizeof(led_name));
-       else
-@@ -178,6 +314,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]);
+       if (pdata && pdata->leds && pdata->num_leds)
+               for (i = 0; i < pdata->num_leds; i++) {
+                       if (pdata->leds[i].gpio == sc->sc_ah->led_pin)
+@@ -183,6 +319,7 @@ void ath_init_leds(struct ath_softc *sc)
+       ath_create_gpio_led(sc, sc->sc_ah->led_pin, led_name, trigger,
+                          !sc->sc_ah->config.led_active_high);
  }
 +
  #endif