ath9k: add support for overriding LED pin and GPIO settings from platform data

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

3 files changed, 16 insertions, 8 deletions

diff --git a/drivers/net/wireless/ath/ath9k/gpio.c b/drivers/net/wireless/ath/ath9k/gpio.c
index 0fb8f8ac275a..44a0a886124d 100644
--- a/drivers/net/wireless/ath/ath9k/gpio.c
+++ b/drivers/net/wireless/ath/ath9k/gpio.c
@@ -41,12 +41,14 @@ void ath_init_leds(struct ath_softc *sc)
 {
         int ret;
 
-        if (AR_SREV_9287(sc->sc_ah))
-                sc->sc_ah->led_pin = ATH_LED_PIN_9287;
-        else if (AR_SREV_9485(sc->sc_ah))
-                sc->sc_ah->led_pin = ATH_LED_PIN_9485;
-        else
-                sc->sc_ah->led_pin = ATH_LED_PIN_DEF;
+        if (sc->sc_ah->led_pin < 0) {
+                if (AR_SREV_9287(sc->sc_ah))
+                        sc->sc_ah->led_pin = ATH_LED_PIN_9287;
+                else if (AR_SREV_9485(sc->sc_ah))
+                        sc->sc_ah->led_pin = ATH_LED_PIN_9485;
+                else
+                        sc->sc_ah->led_pin = ATH_LED_PIN_DEF;
+        }
 
         /* Configure gpio 1 for output */
         ath9k_hw_cfg_output(sc->sc_ah, sc->sc_ah->led_pin,
diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h
index 775c0eb10b95..3d9fc6e391a7 100644
--- a/drivers/net/wireless/ath/ath9k/hw.h
+++ b/drivers/net/wireless/ath/ath9k/hw.h
@@ -798,7 +798,7 @@ struct ath_hw {
         u32 originalGain[22];
         int initPDADC;
         int PDADCdelta;
-        u8 led_pin;
+        int led_pin;
         u32 gpio_mask;
         u32 gpio_val;
 
diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c
index e22e8215d941..cdb0f1c89a0e 100644
--- a/drivers/net/wireless/ath/ath9k/init.c
+++ b/drivers/net/wireless/ath/ath9k/init.c
@@ -553,8 +553,14 @@ static int ath9k_init_softc(u16 devid, struct ath_softc *sc, u16 subsysid,
         ah->hw_version.subsysid = subsysid;
         sc->sc_ah = ah;
 
-        if (!pdata)
+        if (!pdata) {
                 ah->ah_flags |= AH_USE_EEPROM;
+                sc->sc_ah->led_pin = -1;
+        } else {
+                sc->sc_ah->gpio_mask = pdata->gpio_mask;
+                sc->sc_ah->gpio_val = pdata->gpio_val;
+                sc->sc_ah->led_pin = pdata->led_pin;
+        }
 
         common = ath9k_hw_common(ah);
         common->ops = &ath9k_common_ops;