From 5034ff8395447d72b427867fc3469b3601cd83f2 Mon Sep 17 00:00:00 2001 From: nbd Date: Tue, 22 Mar 2011 21:00:58 +0000 Subject: mac80211: update to wireless-testing 2011-03-22 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26273 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../patches/409-ath9k_platform_settings.patch | 65 ---------------------- 1 file changed, 65 deletions(-) delete mode 100644 package/mac80211/patches/409-ath9k_platform_settings.patch (limited to 'package/mac80211/patches/409-ath9k_platform_settings.patch') diff --git a/package/mac80211/patches/409-ath9k_platform_settings.patch b/package/mac80211/patches/409-ath9k_platform_settings.patch deleted file mode 100644 index 6ce43b600..000000000 --- a/package/mac80211/patches/409-ath9k_platform_settings.patch +++ /dev/null @@ -1,65 +0,0 @@ ---- 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, s - 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; ---- a/drivers/net/wireless/ath/ath9k/hw.h -+++ b/drivers/net/wireless/ath/ath9k/hw.h -@@ -794,7 +794,7 @@ struct ath_hw { - u32 originalGain[22]; - int initPDADC; - int PDADCdelta; -- u8 led_pin; -+ int led_pin; - u32 gpio_mask; - u32 gpio_val; - ---- a/drivers/net/wireless/ath/ath9k/gpio.c -+++ b/drivers/net/wireless/ath/ath9k/gpio.c -@@ -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; -+ } - - /* Configure gpio 1 for output */ - ath9k_hw_cfg_output(sc->sc_ah, sc->sc_ah->led_pin, ---- a/include/linux/ath9k_platform.h -+++ b/include/linux/ath9k_platform.h -@@ -24,6 +24,10 @@ - struct ath9k_platform_data { - u16 eeprom_data[ATH9K_PLAT_EEP_MAX_WORDS]; - u8 *macaddr; -+ -+ int led_pin; -+ u32 gpio_mask; -+ u32 gpio_val; - }; - - #endif /* _LINUX_ATH9K_PLATFORM_H */ -- cgit v1.2.3