mac80211: update to wireless-testing 2010-11-10 + some pending work

SVN-Revision: 23968

1 files changed, 58 insertions, 0 deletions

diff --git a/package/mac80211/patches/300-ath9k_gpio_settings.patch b/package/mac80211/patches/300-ath9k_gpio_settings.patch
new file mode 100644
index 0000000000..2bee610114
--- /dev/null
+++ b/package/mac80211/patches/300-ath9k_gpio_settings.patch
@@ -0,0 +1,58 @@
+--- a/drivers/net/wireless/ath/ath9k/debug.c
++++ b/drivers/net/wireless/ath/ath9k/debug.c
+@@ -932,6 +932,12 @@ int ath9k_init_debug(struct ath_hw *ah)
+ 			sc->debug.debugfs_phy, &ah->config.cwm_ignore_extcca))
+ 		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
+@@ -751,6 +751,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
+@@ -1182,6 +1182,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;
+@@ -1468,6 +1482,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);