diff options
author | Felix Fietkau <nbd@openwrt.org> | 2011-06-24 19:53:13 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2011-06-24 19:53:13 +0000 |
commit | 2686ccd16df677ae3f4250bc51c7c2fd7b6688d7 (patch) | |
tree | a44f783eb47dde96b98457e9980bab5808af8a0c /package/mac80211/patches/542-ath9k-add-MAC-revision-detection-for-AR9330.patch | |
parent | fdc2c49a186b639f8398aa1f38d6a5175fdb57f3 (diff) | |
download | upstream-2686ccd16df677ae3f4250bc51c7c2fd7b6688d7.tar.gz upstream-2686ccd16df677ae3f4250bc51c7c2fd7b6688d7.tar.bz2 upstream-2686ccd16df677ae3f4250bc51c7c2fd7b6688d7.zip |
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/542-ath9k-add-MAC-revision-detection-for-AR9330.patch')
-rw-r--r-- | package/mac80211/patches/542-ath9k-add-MAC-revision-detection-for-AR9330.patch | 48 |
1 files changed, 0 insertions, 48 deletions
diff --git a/package/mac80211/patches/542-ath9k-add-MAC-revision-detection-for-AR9330.patch b/package/mac80211/patches/542-ath9k-add-MAC-revision-detection-for-AR9330.patch deleted file mode 100644 index a1b5be6828..0000000000 --- a/package/mac80211/patches/542-ath9k-add-MAC-revision-detection-for-AR9330.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- a/drivers/net/wireless/ath/ath9k/hw.c -+++ b/drivers/net/wireless/ath/ath9k/hw.c -@@ -252,6 +252,15 @@ static void ath9k_hw_read_revisions(stru - case AR5416_AR9100_DEVID: - ah->hw_version.macVersion = AR_SREV_VERSION_9100; - break; -+ case AR9300_DEVID_AR9330: -+ ah->hw_version.macVersion = AR_SREV_VERSION_9330; -+ if (ah->get_mac_revision) { -+ ah->hw_version.macRev = ah->get_mac_revision(); -+ } else { -+ val = REG_READ(ah, AR_SREV); -+ ah->hw_version.macRev = MS(val, AR_SREV_REVISION2); -+ } -+ return; - case AR9300_DEVID_AR9340: - ah->hw_version.macVersion = AR_SREV_VERSION_9340; - val = REG_READ(ah, AR_SREV); ---- a/drivers/net/wireless/ath/ath9k/hw.h -+++ b/drivers/net/wireless/ath/ath9k/hw.h -@@ -863,6 +863,7 @@ struct ath_hw { - u32 ent_mode; - - bool is_clk_25mhz; -+ int (*get_mac_revision)(void); - }; - - struct ath_bus_ops { ---- a/drivers/net/wireless/ath/ath9k/init.c -+++ b/drivers/net/wireless/ath/ath9k/init.c -@@ -575,6 +575,7 @@ static int ath9k_init_softc(u16 devid, s - sc->sc_ah->gpio_val = pdata->gpio_val; - sc->sc_ah->led_pin = pdata->led_pin; - ah->is_clk_25mhz = pdata->is_clk_25mhz; -+ ah->get_mac_revision = pdata->get_mac_revision; - } - - common = ath9k_hw_common(ah); ---- a/include/linux/ath9k_platform.h -+++ b/include/linux/ath9k_platform.h -@@ -30,6 +30,7 @@ struct ath9k_platform_data { - u32 gpio_val; - - bool is_clk_25mhz; -+ int (*get_mac_revision)(void); - }; - - #endif /* _LINUX_ATH9K_PLATFORM_H */ |