|
|
@@ -29,7 +29,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
|
|
|
|
|
|
#ifdef CPTCFG_MAC80211_LEDS
|
|
|
|
|
|
-@@ -129,6 +131,64 @@ static void ath9k_unregister_gpio_chip(s
|
|
|
+@@ -129,6 +131,67 @@ static void ath9k_unregister_gpio_chip(s
|
|
|
sc->gpiochip = NULL;
|
|
|
}
|
|
|
|
|
|
@@ -59,6 +59,9 @@ Signed-off-by: Felix Fietkau <[email protected]>
|
|
|
+ return;
|
|
|
+
|
|
|
+ for (i = 0; i < pdata->num_btns; i++) {
|
|
|
++ if (pdata->btns[i].gpio == sc->sc_ah->led_pin)
|
|
|
++ sc->sc_ah->led_pin = -1;
|
|
|
++
|
|
|
+ ath9k_hw_gpio_request_in(sc->sc_ah, pdata->btns[i].gpio,
|
|
|
+ "ath9k-gpio");
|
|
|
+ bt[i].gpio = sc->gpiochip->gchip.base + pdata->btns[i].gpio;
|
|
|
@@ -94,7 +97,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
|
|
|
#else /* CONFIG_GPIOLIB */
|
|
|
|
|
|
static inline void ath9k_register_gpio_chip(struct ath_softc *sc)
|
|
|
-@@ -139,6 +199,14 @@ static inline void ath9k_unregister_gpio
|
|
|
+@@ -139,6 +202,14 @@ static inline void ath9k_unregister_gpio
|
|
|
{
|
|
|
}
|
|
|
|
|
|
@@ -109,7 +112,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
|
|
|
#endif /* CONFIG_GPIOLIB */
|
|
|
|
|
|
/********************************/
|
|
|
-@@ -262,6 +330,7 @@ void ath_deinit_leds(struct ath_softc *s
|
|
|
+@@ -262,6 +333,7 @@ void ath_deinit_leds(struct ath_softc *s
|
|
|
{
|
|
|
struct ath_led *led;
|
|
|
|
|
|
@@ -117,7 +120,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
|
|
|
while (!list_empty(&sc->leds)) {
|
|
|
led = list_first_entry(&sc->leds, struct ath_led, list);
|
|
|
#ifdef CONFIG_GPIOLIB
|
|
|
-@@ -301,6 +370,7 @@ void ath_init_leds(struct ath_softc *sc)
|
|
|
+@@ -301,6 +373,7 @@ void ath_init_leds(struct ath_softc *sc)
|
|
|
}
|
|
|
|
|
|
ath_fill_led_pin(sc);
|