diff options
author | Felix Fietkau <nbd@openwrt.org> | 2012-04-16 21:08:41 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2012-04-16 21:08:41 +0000 |
commit | c0c371b58134d391f46de6dabf2bd0a96267cb38 (patch) | |
tree | 7b489799c8ddbfdd0ac3462317ce2be1a41368ed /package/mac80211/patches/431-add_platform_eeprom_support_to_ath5k.patch | |
parent | c379502147ee31e5b429ea8c38ae8c79e158e96a (diff) | |
download | master-31e0f0ae-c0c371b58134d391f46de6dabf2bd0a96267cb38.tar.gz master-31e0f0ae-c0c371b58134d391f46de6dabf2bd0a96267cb38.tar.bz2 master-31e0f0ae-c0c371b58134d391f46de6dabf2bd0a96267cb38.zip |
mac80211: update to wireless-testing 2012-04-13
SVN-Revision: 31322
Diffstat (limited to 'package/mac80211/patches/431-add_platform_eeprom_support_to_ath5k.patch')
-rw-r--r-- | package/mac80211/patches/431-add_platform_eeprom_support_to_ath5k.patch | 56 |
1 files changed, 56 insertions, 0 deletions
diff --git a/package/mac80211/patches/431-add_platform_eeprom_support_to_ath5k.patch b/package/mac80211/patches/431-add_platform_eeprom_support_to_ath5k.patch new file mode 100644 index 0000000000..36b2c1c9f0 --- /dev/null +++ b/package/mac80211/patches/431-add_platform_eeprom_support_to_ath5k.patch @@ -0,0 +1,56 @@ +--- a/drivers/net/wireless/ath/ath5k/pci.c ++++ b/drivers/net/wireless/ath/ath5k/pci.c +@@ -22,6 +22,7 @@ + #include <linux/pci-aspm.h> + #include <linux/etherdevice.h> + #include <linux/module.h> ++#include <linux/ath5k_platform.h> + #include "../ath.h" + #include "ath5k.h" + #include "debug.h" +@@ -72,7 +73,7 @@ static void ath5k_pci_read_cachesize(str + } + + /* +- * Read from eeprom ++ * Read from eeprom or platform_data + */ + static bool + ath5k_pci_eeprom_read(struct ath_common *common, u32 offset, u16 *data) +@@ -80,6 +81,19 @@ ath5k_pci_eeprom_read(struct ath_common + struct ath5k_hw *ah = (struct ath5k_hw *) common->ah; + u32 status, timeout; + ++ struct ath5k_platform_data *pdata = NULL; ++ ++ if (ah->pdev) ++ pdata = ah->pdev->dev.platform_data; ++ ++ if (pdata && pdata->eeprom_data && pdata->eeprom_data[61] == AR5K_EEPROM_MAGIC_VALUE) { ++ if (offset >= ATH5K_PLAT_EEP_MAX_WORDS) ++ return false; ++ ++ *data = pdata->eeprom_data[offset]; ++ return true; ++ } ++ + /* + * Initialize EEPROM access + */ +@@ -123,6 +137,16 @@ static int ath5k_pci_eeprom_read_mac(str + u16 data; + int octet; + ++ struct ath5k_platform_data *pdata = NULL; ++ ++ if (ah->pdev) ++ pdata = ah->pdev->dev.platform_data; ++ ++ if (pdata && pdata->macaddr) { ++ memcpy(mac, pdata->macaddr, ETH_ALEN); ++ return 0; ++ } ++ + AR5K_EEPROM_READ(0x20, data); + + for (offset = 0x1f, octet = 0, total = 0; offset >= 0x1d; offset--) { |