diff options
| author | Martin Blumenstingl <martin.blumenstingl@googlemail.com> | 2016-07-01 15:41:17 +0200 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2016-07-02 19:34:50 +0200 |
| commit | 3ce71eaedd3ea25be0c8723fefc68e3f3aac7610 (patch) | |
| tree | 7b80308e01d21125ccb0db9f3a8e8b61dafb7307 /package/kernel/mac80211/patches/548-ath9k_enable_gpio_chip.patch | |
| parent | cbfeb7796e71aabc08b1f9e9f8818ba6279e2e29 (diff) | |
| download | upstream-3ce71eaedd3ea25be0c8723fefc68e3f3aac7610.tar.gz upstream-3ce71eaedd3ea25be0c8723fefc68e3f3aac7610.tar.bz2 upstream-3ce71eaedd3ea25be0c8723fefc68e3f3aac7610.zip | |
kernel: mac80211: fold the AR9280 GPIO patch into the ath9k GPIO patch
This folds 550-ath9k_add_ar9280_gpio_chip.patch into
548-ath9k_enable_gpio_chip.patch because the former patch only extends
code which is introduced in the latter.
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Diffstat (limited to 'package/kernel/mac80211/patches/548-ath9k_enable_gpio_chip.patch')
| -rw-r--r-- | package/kernel/mac80211/patches/548-ath9k_enable_gpio_chip.patch | 14 |
1 files changed, 8 insertions, 6 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 1c89e42c7b..031be09d3b 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,138 @@ +@@ -16,13 +16,140 @@ #include "ath9k.h" #include <linux/ath9k_platform.h> @@ -119,11 +119,13 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> + struct ath9k_gpio_chip *gc; + u16 ng; + -+ /* for now only AR9285 and AR9287 are recognized */ ++ /* supported chips are AR9280, AR9285 and AR9287 */ + if (AR_SREV_9287(sc->sc_ah)) + ng = AR9287_NUM_GPIO; + else if (AR_SREV_9285(sc->sc_ah)) + ng = AR9285_NUM_GPIO; ++ else if (AR_SREV_9280(sc->sc_ah)) ++ ng = AR9280_NUM_GPIO; + else + return; + @@ -186,7 +188,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 +205,12 @@ static int ath_add_led(struct ath_softc +@@ -80,6 +207,12 @@ static int ath_add_led(struct ath_softc else ath9k_hw_set_gpio(sc->sc_ah, gpio->gpio, gpio->active_low); @@ -199,7 +201,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> return 0; } -@@ -136,12 +267,18 @@ void ath_deinit_leds(struct ath_softc *s +@@ -136,12 +269,18 @@ void ath_deinit_leds(struct ath_softc *s while (!list_empty(&sc->leds)) { led = list_first_entry(&sc->leds, struct ath_led, list); @@ -218,7 +220,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> } void ath_init_leds(struct ath_softc *sc) -@@ -158,6 +295,8 @@ void ath_init_leds(struct ath_softc *sc) +@@ -158,6 +297,8 @@ void ath_init_leds(struct ath_softc *sc) ath_fill_led_pin(sc); @@ -227,7 +229,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 +317,7 @@ void ath_init_leds(struct ath_softc *sc) +@@ -178,6 +319,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]); } |