X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/51bea45f82cd3aadb926d7ab28545191c8458ddc..3ae6fa17227b88b37c45f865b4040e5bcae0a45f:/package/mac80211/patches/409-ath9k_platform_settings.patch?ds=inline

diff --git a/package/mac80211/patches/409-ath9k_platform_settings.patch b/package/mac80211/patches/409-ath9k_platform_settings.patch
index c0530fd9f..6ce43b600 100644
--- a/package/mac80211/patches/409-ath9k_platform_settings.patch
+++ b/package/mac80211/patches/409-ath9k_platform_settings.patch
@@ -1,15 +1,14 @@
 --- a/drivers/net/wireless/ath/ath9k/init.c
 +++ b/drivers/net/wireless/ath/ath9k/init.c
-@@ -535,8 +535,15 @@ static int ath9k_init_softc(u16 devid, s
+@@ -553,8 +553,14 @@ static int ath9k_init_softc(u16 devid, s
  	ah->hw_version.subsysid = subsysid;
  	sc->sc_ah = ah;
  
--	if (!sc->dev->platform_data)
-+	if (!sc->dev->platform_data) {
+-	if (!pdata)
++	if (!pdata) {
  		ah->ah_flags |= AH_USE_EEPROM;
 +		sc->sc_ah->led_pin = -1;
 +	} else {
-+		pdata = (struct ath9k_platform_data *) sc->dev->platform_data;
 +		sc->sc_ah->gpio_mask = pdata->gpio_mask;
 +		sc->sc_ah->gpio_val = pdata->gpio_val;
 +		sc->sc_ah->led_pin = pdata->led_pin;
@@ -19,7 +18,7 @@
  	common->ops = &ath9k_common_ops;
 --- a/drivers/net/wireless/ath/ath9k/hw.h
 +++ b/drivers/net/wireless/ath/ath9k/hw.h
-@@ -788,7 +788,7 @@ struct ath_hw {
+@@ -794,7 +794,7 @@ struct ath_hw {
  	u32 originalGain[22];
  	int initPDADC;
  	int PDADCdelta;
@@ -30,17 +29,21 @@
  
 --- a/drivers/net/wireless/ath/ath9k/gpio.c
 +++ b/drivers/net/wireless/ath/ath9k/gpio.c
-@@ -147,10 +147,12 @@ void ath_init_leds(struct ath_softc *sc)
+@@ -44,12 +44,14 @@ void ath_init_leds(struct ath_softc *sc)
  	if (AR_SREV_9100(sc->sc_ah))
  		return;
  
 -	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;
 +	}