projects
/
openwrt
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: mac80211: enable the gpio controller for all ath9k devices
[openwrt/openwrt.git]
/
package
/
kernel
/
mac80211
/
patches
/
549-ath9k_enable_gpio_buttons.patch
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 c7973bb039c2ce117de217a61e538c16b65f6244..9d887ceb5e950b2d90d6e8caf119a16906ce21e0 100644
(file)
--- 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
#ifdef CPTCFG_MAC80211_LEDS
-@@ -1
32,6 +134
,64 @@ static void ath9k_unregister_gpio_chip(s
+@@ -1
24,6 +126
,64 @@ static void ath9k_unregister_gpio_chip(s
sc->gpiochip = NULL;
}
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)
#else /* CONFIG_GPIOLIB */
static inline void ath9k_register_gpio_chip(struct ath_softc *sc)
-@@ -1
42,6 +202
,14 @@ static inline void ath9k_unregister_gpio
+@@ -1
34,6 +194
,14 @@ static inline void ath9k_unregister_gpio
{
}
{
}
@@
-109,7
+109,7
@@
Signed-off-by: Felix Fietkau <nbd@nbd.name>
#endif /* CONFIG_GPIOLIB */
/********************************/
#endif /* CONFIG_GPIOLIB */
/********************************/
-@@ -2
65,6 +333
,7 @@ void ath_deinit_leds(struct ath_softc *s
+@@ -2
57,6 +325
,7 @@ void ath_deinit_leds(struct ath_softc *s
{
struct ath_led *led;
{
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
while (!list_empty(&sc->leds)) {
led = list_first_entry(&sc->leds, struct ath_led, list);
#ifdef CONFIG_GPIOLIB
-@@ -2
96,6 +365
,7 @@ void ath_init_leds(struct ath_softc *sc)
+@@ -2
88,6 +357
,7 @@ void ath_init_leds(struct ath_softc *sc)
ath_fill_led_pin(sc);
ath9k_register_gpio_chip(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));
if (pdata && pdata->led_name)
strncpy(led_name, pdata->led_name, sizeof(led_name));
-@@ -3
11,7 +381
,7 @@ void ath_init_leds(struct ath_softc *sc)
+@@ -3
03,7 +373
,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);
ath_create_gpio_led(sc, sc->sc_ah->led_pin, led_name, trigger,
!sc->sc_ah->config.led_active_high);