diff options
author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-03-22 21:00:58 +0000 |
---|---|---|
committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-03-22 21:00:58 +0000 |
commit | 5034ff8395447d72b427867fc3469b3601cd83f2 (patch) | |
tree | 29b1bf399c9cc9974981422b01b4db8d2034952f /package/mac80211/patches/300-ath9k_gpio_settings.patch | |
parent | 2dbaa78d9184ccb2010d20c9c37b56f9e17cb96f (diff) |
mac80211: update to wireless-testing 2011-03-22
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26273 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/300-ath9k_gpio_settings.patch')
-rw-r--r-- | package/mac80211/patches/300-ath9k_gpio_settings.patch | 58 |
1 files changed, 0 insertions, 58 deletions
diff --git a/package/mac80211/patches/300-ath9k_gpio_settings.patch b/package/mac80211/patches/300-ath9k_gpio_settings.patch deleted file mode 100644 index af2057759e..0000000000 --- a/package/mac80211/patches/300-ath9k_gpio_settings.patch +++ /dev/null @@ -1,58 +0,0 @@ ---- a/drivers/net/wireless/ath/ath9k/debug.c -+++ b/drivers/net/wireless/ath/ath9k/debug.c -@@ -1145,6 +1145,12 @@ int ath9k_init_debug(struct ath_hw *ah) - sc, &fops_regdump)) - goto err; - -+ debugfs_create_u32("gpio_mask", S_IRUSR | S_IWUSR, -+ sc->debug.debugfs_phy, &sc->sc_ah->gpio_mask); -+ -+ debugfs_create_u32("gpio_val", S_IRUSR | S_IWUSR, -+ sc->debug.debugfs_phy, &sc->sc_ah->gpio_val); -+ - sc->debug.regidx = 0; - return 0; - err: ---- a/drivers/net/wireless/ath/ath9k/hw.h -+++ b/drivers/net/wireless/ath/ath9k/hw.h -@@ -795,6 +795,8 @@ struct ath_hw { - int initPDADC; - int PDADCdelta; - u8 led_pin; -+ u32 gpio_mask; -+ u32 gpio_val; - - struct ar5416IniArray iniModes; - struct ar5416IniArray iniCommon; ---- a/drivers/net/wireless/ath/ath9k/hw.c -+++ b/drivers/net/wireless/ath/ath9k/hw.c -@@ -1212,6 +1212,20 @@ static bool ath9k_hw_channel_change(stru - return true; - } - -+static void ath9k_hw_apply_gpio_override(struct ath_hw *ah) -+{ -+ u32 gpio_mask = ah->gpio_mask; -+ int i; -+ -+ for (i = 0; gpio_mask; i++, gpio_mask >>= 1) { -+ if (!(gpio_mask & 1)) -+ continue; -+ -+ ath9k_hw_cfg_output(ah, i, AR_GPIO_OUTPUT_MUX_AS_OUTPUT); -+ ath9k_hw_set_gpio(ah, i, !!(ah->gpio_val & BIT(i))); -+ } -+} -+ - bool ath9k_hw_check_alive(struct ath_hw *ah) - { - int count = 50; -@@ -1500,6 +1514,8 @@ int ath9k_hw_reset(struct ath_hw *ah, st - if (AR_SREV_9300_20_OR_LATER(ah)) - ar9003_hw_bb_watchdog_config(ah); - -+ ath9k_hw_apply_gpio_override(ah); -+ - return 0; - } - EXPORT_SYMBOL(ath9k_hw_reset); |