diff options
| author | Felix Fietkau <nbd@nbd.name> | 2016-07-11 15:53:28 +0200 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2016-07-11 15:53:48 +0200 |
| commit | cef1f4ef2b279a68234fd4f37fcc6608fa2dda3e (patch) | |
| tree | 9b71c3b65928f59312becec7e283db0eb1b0dde1 /package/kernel/mac80211 | |
| parent | 5b07e8731b9f02b602f2410ff6dd57fc9ba7b9b6 (diff) | |
| download | master-31e0f0ae-cef1f4ef2b279a68234fd4f37fcc6608fa2dda3e.tar.gz master-31e0f0ae-cef1f4ef2b279a68234fd4f37fcc6608fa2dda3e.tar.bz2 master-31e0f0ae-cef1f4ef2b279a68234fd4f37fcc6608fa2dda3e.zip | |
ath9k: explicitly clear gpio chip owner
The core can set it based on the parent device on register
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'package/kernel/mac80211')
| -rw-r--r-- | package/kernel/mac80211/patches/548-ath9k_enable_gpio_chip.patch | 11 | ||||
| -rw-r--r-- | package/kernel/mac80211/patches/549-ath9k_enable_gpio_buttons.patch | 10 |
2 files changed, 11 insertions, 10 deletions
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 32e46ee945..af5e9f6358 100644 --- a/package/kernel/mac80211/patches/548-ath9k_enable_gpio_chip.patch +++ b/package/kernel/mac80211/patches/548-ath9k_enable_gpio_chip.patch @@ -45,7 +45,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> #ifdef CPTCFG_ATH9K_DEBUGFS --- a/drivers/net/wireless/ath/ath9k/gpio.c +++ b/drivers/net/wireless/ath/ath9k/gpio.c -@@ -16,13 +16,134 @@ +@@ -16,13 +16,135 @@ #include "ath9k.h" #include <linux/ath9k_platform.h> @@ -144,6 +144,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> + return; + } + ++ gc->gchip.owner = NULL; + sc->gpiochip = gc; + gc->sc = sc; +} @@ -182,7 +183,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> static void ath_fill_led_pin(struct ath_softc *sc) { struct ath_hw *ah = sc->sc_ah; -@@ -80,6 +201,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); @@ -195,7 +196,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> return 0; } -@@ -136,12 +263,18 @@ void ath_deinit_leds(struct ath_softc *s +@@ -136,12 +264,18 @@ void ath_deinit_leds(struct ath_softc *s while (!list_empty(&sc->leds)) { led = list_first_entry(&sc->leds, struct ath_led, list); @@ -214,7 +215,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> } void ath_init_leds(struct ath_softc *sc) -@@ -158,6 +291,8 @@ void ath_init_leds(struct ath_softc *sc) +@@ -158,6 +292,8 @@ void ath_init_leds(struct ath_softc *sc) ath_fill_led_pin(sc); @@ -223,7 +224,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> if (pdata && pdata->led_name) strncpy(led_name, pdata->led_name, sizeof(led_name)); else -@@ -178,6 +313,7 @@ void ath_init_leds(struct ath_softc *sc) +@@ -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]); } diff --git a/package/kernel/mac80211/patches/549-ath9k_enable_gpio_buttons.patch b/package/kernel/mac80211/patches/549-ath9k_enable_gpio_buttons.patch index 25496106ae..d962eda978 100644 --- a/package/kernel/mac80211/patches/549-ath9k_enable_gpio_buttons.patch +++ b/package/kernel/mac80211/patches/549-ath9k_enable_gpio_buttons.patch @@ -29,7 +29,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> #ifdef CPTCFG_MAC80211_LEDS -@@ -128,6 +130,64 @@ static void ath9k_unregister_gpio_chip(s +@@ -129,6 +131,64 @@ static void ath9k_unregister_gpio_chip(s sc->gpiochip = NULL; } @@ -94,7 +94,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> #else /* CONFIG_GPIOLIB */ static inline void ath9k_register_gpio_chip(struct ath_softc *sc) -@@ -138,6 +198,14 @@ static inline void ath9k_unregister_gpio +@@ -139,6 +199,14 @@ static inline void ath9k_unregister_gpio { } @@ -109,7 +109,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> #endif /* CONFIG_GPIOLIB */ /********************************/ -@@ -261,6 +329,7 @@ void ath_deinit_leds(struct ath_softc *s +@@ -262,6 +330,7 @@ void ath_deinit_leds(struct ath_softc *s { struct ath_led *led; @@ -117,7 +117,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> while (!list_empty(&sc->leds)) { led = list_first_entry(&sc->leds, struct ath_led, list); #ifdef CONFIG_GPIOLIB -@@ -292,6 +361,7 @@ void ath_init_leds(struct ath_softc *sc) +@@ -293,6 +362,7 @@ void ath_init_leds(struct ath_softc *sc) ath_fill_led_pin(sc); ath9k_register_gpio_chip(sc); @@ -125,7 +125,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> if (pdata && pdata->led_name) strncpy(led_name, pdata->led_name, sizeof(led_name)); -@@ -307,7 +377,7 @@ void ath_init_leds(struct ath_softc *sc) +@@ -308,7 +378,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); |