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>

3 files changed, 13 insertions, 38 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]);
  }
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 c7973bb039..41bebbb44f 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
  
-@@ -132,6 +134,64 @@ static void ath9k_unregister_gpio_chip(s
+@@ -134,6 +136,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)
-@@ -142,6 +202,14 @@ static inline void ath9k_unregister_gpio
+@@ -144,6 +204,14 @@ static inline void ath9k_unregister_gpio
  {
  }
  
@@ -109,7 +109,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  #endif /* CONFIG_GPIOLIB */
  
  /********************************/
-@@ -265,6 +333,7 @@ void ath_deinit_leds(struct ath_softc *s
+@@ -267,6 +335,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
-@@ -296,6 +365,7 @@ void ath_init_leds(struct ath_softc *sc)
+@@ -298,6 +367,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));
-@@ -311,7 +381,7 @@ void ath_init_leds(struct ath_softc *sc)
+@@ -313,7 +383,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);
  
diff --git a/package/kernel/mac80211/patches/550-ath9k_add_ar9280_gpio_chip.patch b/package/kernel/mac80211/patches/550-ath9k_add_ar9280_gpio_chip.patch
deleted file mode 100644
index 22e2c66747..0000000000
--- a/package/kernel/mac80211/patches/550-ath9k_add_ar9280_gpio_chip.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Michal Cieslakiewicz <michal.cieslakiewicz@wp.pl>
-Date: Thu, 21 Apr 2016 23:00:54 +0200
-Subject: [PATCH] mac80211: ath9k: add GPIO support for AR9280 chip
-
-Enable access to GPIO on Atheros wireless chip AR9280.
-Support for 9280 is added to existing 9285/9287 subsystem
-because these 3 chips differ only in number of GPIO pins.
-
-Signed-off-by: Michal Cieslakiewicz <michal.cieslakiewicz@wp.pl>
----
---- a/drivers/net/wireless/ath/ath9k/gpio.c
-+++ b/drivers/net/wireless/ath/ath9k/gpio.c
-@@ -88,11 +88,13 @@ static void ath9k_register_gpio_chip(str
- 	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;
-