ath9k: drop obsolete patch

[openwrt/staging/lynxis/omap.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 10047a7cfda8e0c1b8be231730f822d0e6a27081..31dac29ad77b89626d300d9a82ba3bd2cc2210a1 100644 (file)
--- a/package/kernel/mac80211/patches/548-ath9k_enable_gpio_chip.patch
+++ b/package/kernel/mac80211/patches/548-ath9k_enable_gpio_chip.patch
@@ -221,21 +221,23 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
        char led_name[32];
        const char *trigger;
        int i;
-@@ -156,6 +291,13 @@ void ath_init_leds(struct ath_softc *sc)
+@@ -156,6 +291,15 @@ void ath_init_leds(struct ath_softc *sc)
        if (AR_SREV_9100(sc->sc_ah))
                return;
  
 +      if (!np)
 +              ath9k_register_gpio_chip(sc);
 +
-+      /* setup gpio controller only if requested */
-+      if (of_property_read_bool(np, "gpio-controller"))
++      /* setup gpio controller only if requested and skip the led_pin setup */
++      if (of_property_read_bool(np, "gpio-controller")) {
 +              ath9k_register_gpio_chip(sc);
++              return;
++      }
 +
        ath_fill_led_pin(sc);
  
        if (pdata && pdata->leds && pdata->num_leds)
-@@ -183,6 +325,7 @@ void ath_init_leds(struct ath_softc *sc)
+@@ -180,6 +324,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);
  }