summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSenthil Balasubramanian2011-02-28 10:46:47 +0100
committerJohn W. Linville2011-02-28 20:06:55 +0100
commit15178535ad2f8fd8f7e803791f25395aa69f80ac (patch)
tree956c2205bc3f4a1d5cc78742c401734c92ff29b0
parentath9k: use generic mac80211 LED blinking code (diff)
downloadkernel-qcow2-linux-15178535ad2f8fd8f7e803791f25395aa69f80ac.tar.gz
kernel-qcow2-linux-15178535ad2f8fd8f7e803791f25395aa69f80ac.tar.xz
kernel-qcow2-linux-15178535ad2f8fd8f7e803791f25395aa69f80ac.zip
ath9k: Fix incorrect GPIO LED pin for AR9485
AR9485 doesn't use the default GPIO pin for LED and GPIO 6 is actually used for this. Signed-off-by: Senthil Balasubramanian <senthilkumar@atheros.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/ath/ath9k/ath9k.h1
-rw-r--r--drivers/net/wireless/ath/ath9k/gpio.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h
index 367b51430ff0..c718ab512a97 100644
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
@@ -449,6 +449,7 @@ void ath9k_btcoex_timer_pause(struct ath_softc *sc);
#define ATH_LED_PIN_DEF 1
#define ATH_LED_PIN_9287 8
+#define ATH_LED_PIN_9485 6
#ifdef CONFIG_MAC80211_LEDS
void ath_init_leds(struct ath_softc *sc);
diff --git a/drivers/net/wireless/ath/ath9k/gpio.c b/drivers/net/wireless/ath/ath9k/gpio.c
index e369bf7e575f..0fb8f8ac275a 100644
--- a/drivers/net/wireless/ath/ath9k/gpio.c
+++ b/drivers/net/wireless/ath/ath9k/gpio.c
@@ -43,6 +43,8 @@ void ath_init_leds(struct ath_softc *sc)
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;