mac80211: brcmfmac: backport patches pushed on 2017-03-20

[openwrt/openwrt.git] / package / kernel / mac80211 / patches / 531-ath9k_extra_platform_leds.patch

diff --git a/package/kernel/mac80211/patches/531-ath9k_extra_platform_leds.patch b/package/kernel/mac80211/patches/531-ath9k_extra_platform_leds.patch
index 764242cd1c44eb23fba46782ecd66fd101e52e00..35d8e8bd42399797d4904f60d61f7118c156ba7c 100644 (file)
--- a/package/kernel/mac80211/patches/531-ath9k_extra_platform_leds.patch
+++ b/package/kernel/mac80211/patches/531-ath9k_extra_platform_leds.patch
@@ -1,9 +1,9 @@
 --- a/include/linux/ath9k_platform.h
 +++ b/include/linux/ath9k_platform.h
-@@ -35,6 +35,9 @@ struct ath9k_platform_data {
-       bool is_clk_25mhz;
-       int (*get_mac_revision)(void);
+@@ -46,6 +46,9 @@ struct ath9k_platform_data {
        int (*external_reset)(void);
+ 
+       bool use_eeprom;
 +
 +      int num_leds;
 +      const struct gpio_led *leds;
@@ -20,7 +20,7 @@
  
  /********************************/
  /*     LED functions          */
-@@ -88,6 +89,24 @@ int ath_create_gpio_led(struct ath_softc
+@@ -108,6 +109,24 @@ int ath_create_gpio_led(struct ath_softc
        return ret;
  }
  
@@ -45,7 +45,7 @@
  void ath_deinit_leds(struct ath_softc *sc)
  {
        struct ath_led *led;
-@@ -103,8 +122,10 @@ void ath_deinit_leds(struct ath_softc *s
+@@ -124,8 +143,10 @@ void ath_deinit_leds(struct ath_softc *s
  
  void ath_init_leds(struct ath_softc *sc)
  {
@@ -56,10 +56,10 @@
  
        INIT_LIST_HEAD(&sc->leds);
  
-@@ -120,6 +141,12 @@ void ath_init_leds(struct ath_softc *sc)
-               trigger = ieee80211_get_radio_led_name(sc->hw);
+@@ -144,6 +165,12 @@ void ath_init_leds(struct ath_softc *sc)
  
-       ath_create_gpio_led(sc, sc->sc_ah->led_pin, led_name, trigger, 1);
+       ath_create_gpio_led(sc, sc->sc_ah->led_pin, led_name, trigger,
+                          !sc->sc_ah->config.led_active_high);
 +
 +      if (!pdata)
 +              return;
@@ -67,5 +67,5 @@
 +      for (i = 0; i < pdata->num_leds; i++)
 +              ath_create_platform_led(sc, &pdata->leds[i]);
  }
+ #endif
  
- void ath_fill_led_pin(struct ath_softc *sc)