summaryrefslogtreecommitdiffstats
path: root/package/mac80211/patches/569-ath9k-configure-internal-regulator-for-AR9330.patch
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-06-24 19:53:13 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-06-24 19:53:13 +0000
commit437bd1772aceb2fc48ac5b11d68b366d0516715e (patch)
treea44f783eb47dde96b98457e9980bab5808af8a0c /package/mac80211/patches/569-ath9k-configure-internal-regulator-for-AR9330.patch
parentbcf916845dd91cecb3e4e49dbcfe7f634da9e622 (diff)
mac80211: update to wireless-testing 2011-06-22
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27275 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/569-ath9k-configure-internal-regulator-for-AR9330.patch')
-rw-r--r--package/mac80211/patches/569-ath9k-configure-internal-regulator-for-AR9330.patch48
1 files changed, 0 insertions, 48 deletions
diff --git a/package/mac80211/patches/569-ath9k-configure-internal-regulator-for-AR9330.patch b/package/mac80211/patches/569-ath9k-configure-internal-regulator-for-AR9330.patch
deleted file mode 100644
index a09e83db8..000000000
--- a/package/mac80211/patches/569-ath9k-configure-internal-regulator-for-AR9330.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
-+++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
-@@ -3712,7 +3712,7 @@ static void ar9003_hw_internal_regulator
- ath9k_hw_ar9300_get_eeprom(ah, EEP_INTERNAL_REGULATOR);
-
- if (internal_regulator) {
-- if (AR_SREV_9485(ah)) {
-+ if (AR_SREV_9330(ah) || AR_SREV_9485(ah)) {
- int reg_pmu_set;
-
- reg_pmu_set = REG_READ(ah, AR_PHY_PMU2) & ~AR_PHY_PMU2_PGM;
-@@ -3720,9 +3720,24 @@ static void ar9003_hw_internal_regulator
- if (!is_pmu_set(ah, AR_PHY_PMU2, reg_pmu_set))
- return;
-
-- reg_pmu_set = (5 << 1) | (7 << 4) | (1 << 8) |
-- (2 << 14) | (6 << 17) | (1 << 20) |
-- (3 << 24) | (1 << 28);
-+ if (AR_SREV_9330(ah)) {
-+ if (ah->is_clk_25mhz) {
-+ reg_pmu_set = (3 << 1) | (8 << 4) |
-+ (3 << 8) | (1 << 14) |
-+ (6 << 17) | (1 << 20) |
-+ (3 << 24);
-+ } else {
-+ reg_pmu_set = (4 << 1) | (7 << 4) |
-+ (3 << 8) | (1 << 14) |
-+ (6 << 17) | (1 << 20) |
-+ (3 << 24);
-+ }
-+ } else {
-+ reg_pmu_set = (5 << 1) | (7 << 4) |
-+ (1 << 8) | (2 << 14) |
-+ (6 << 17) | (1 << 20) |
-+ (3 << 24) | (1 << 28);
-+ }
-
- REG_WRITE(ah, AR_PHY_PMU1, reg_pmu_set);
- if (!is_pmu_set(ah, AR_PHY_PMU1, reg_pmu_set))
-@@ -3753,7 +3768,7 @@ static void ar9003_hw_internal_regulator
- AR_RTC_REG_CONTROL1_SWREG_PROGRAM);
- }
- } else {
-- if (AR_SREV_9485(ah)) {
-+ if (AR_SREV_9330(ah) || AR_SREV_9485(ah)) {
- REG_RMW_FIELD(ah, AR_PHY_PMU2, AR_PHY_PMU2_PGM, 0);
- while (REG_READ_FIELD(ah, AR_PHY_PMU2,
- AR_PHY_PMU2_PGM))