|
|
@@ -45,7 +45,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
|
|
|
#ifdef CPTCFG_ATH9K_DEBUGFS
|
|
|
--- a/drivers/net/wireless/ath/ath9k/gpio.c
|
|
|
+++ b/drivers/net/wireless/ath/ath9k/gpio.c
|
|
|
-@@ -16,13 +16,139 @@
|
|
|
+@@ -16,13 +16,135 @@
|
|
|
|
|
|
#include "ath9k.h"
|
|
|
#include <linux/ath9k_platform.h>
|
|
|
@@ -127,11 +127,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
|
|
|
+ snprintf(gc->label, sizeof(gc->label), "ath9k-%s",
|
|
|
+ wiphy_name(sc->hw->wiphy));
|
|
|
+#ifdef CONFIG_OF
|
|
|
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,5,0)
|
|
|
+ gc->gchip.parent = sc->dev;
|
|
|
-+#else
|
|
|
-+ gc->gchip.dev = sc->dev;
|
|
|
-+#endif
|
|
|
+#endif
|
|
|
+ gc->gchip.label = gc->label;
|
|
|
+ gc->gchip.base = -1; /* determine base automatically */
|
|
|
@@ -187,7 +183,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
|
|
|
static void ath_fill_led_pin(struct ath_softc *sc)
|
|
|
{
|
|
|
struct ath_hw *ah = sc->sc_ah;
|
|
|
-@@ -80,6 +206,12 @@ static int ath_add_led(struct ath_softc
|
|
|
+@@ -80,6 +202,12 @@ static int ath_add_led(struct ath_softc
|
|
|
else
|
|
|
ath9k_hw_set_gpio(sc->sc_ah, gpio->gpio, gpio->active_low);
|
|
|
|
|
|
@@ -200,7 +196,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
-@@ -136,17 +268,24 @@ void ath_deinit_leds(struct ath_softc *s
|
|
|
+@@ -136,17 +264,24 @@ void ath_deinit_leds(struct ath_softc *s
|
|
|
|
|
|
while (!list_empty(&sc->leds)) {
|
|
|
led = list_first_entry(&sc->leds, struct ath_led, list);
|
|
|
@@ -225,7 +221,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
|
|
|
char led_name[32];
|
|
|
const char *trigger;
|
|
|
int i;
|
|
|
-@@ -156,6 +295,15 @@ 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;
|
|
|
|
|
|
@@ -241,7 +237,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
|
|
|
ath_fill_led_pin(sc);
|
|
|
|
|
|
if (pdata && pdata->leds && pdata->num_leds)
|
|
|
-@@ -180,6 +328,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);
|
|
|
}
|