diff options
| author | John Crispin <blogic@openwrt.org> | 2012-03-25 08:50:56 +0000 |
|---|---|---|
| committer | John Crispin <blogic@openwrt.org> | 2012-03-25 08:50:56 +0000 |
| commit | 2ba198be62555ce326050616e0604a0c76b57f84 (patch) | |
| tree | 0d896bcee0c7aef8eb3eb9173cbf977bf9fa33ef /package | |
| parent | e0e64cdd9b2a782009ca4d87f14ec43017932ea3 (diff) | |
| download | master-187ad058-2ba198be62555ce326050616e0604a0c76b57f84.tar.gz master-187ad058-2ba198be62555ce326050616e0604a0c76b57f84.tar.bz2 master-187ad058-2ba198be62555ce326050616e0604a0c76b57f84.zip | |
[mac80211] adds ath5k platfrom_device eep support
Signed-off-by: Andrej Vlašić <andrej.vlasic0@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31067 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
| -rw-r--r-- | package/mac80211/patches/451-add-platform-eeprom-support-to-ath5k.patch | 56 | ||||
| -rw-r--r-- | package/mac80211/patches/460-ath5k-add-pciids.patch | 11 |
2 files changed, 67 insertions, 0 deletions
diff --git a/package/mac80211/patches/451-add-platform-eeprom-support-to-ath5k.patch b/package/mac80211/patches/451-add-platform-eeprom-support-to-ath5k.patch new file mode 100644 index 0000000000..6e03d70a74 --- /dev/null +++ b/package/mac80211/patches/451-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 +@@ -19,6 +19,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" +@@ -69,7 +70,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) +@@ -77,6 +78,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 + */ +@@ -120,6 +134,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--) { diff --git a/package/mac80211/patches/460-ath5k-add-pciids.patch b/package/mac80211/patches/460-ath5k-add-pciids.patch new file mode 100644 index 0000000000..9d3f11deb2 --- /dev/null +++ b/package/mac80211/patches/460-ath5k-add-pciids.patch @@ -0,0 +1,11 @@ +--- a/drivers/net/wireless/ath/ath5k/pci.c ++++ b/drivers/net/wireless/ath/ath5k/pci.c +@@ -46,6 +46,8 @@ static DEFINE_PCI_DEVICE_TABLE(ath5k_pci + { PCI_VDEVICE(ATHEROS, 0x001b) }, /* 5413 Eagle */ + { PCI_VDEVICE(ATHEROS, 0x001c) }, /* PCI-E cards */ + { PCI_VDEVICE(ATHEROS, 0x001d) }, /* 2417 Nala */ ++ { PCI_VDEVICE(ATHEROS, 0xff16) }, /* 2413,2414 sx76x on lantiq_danube */ ++ { PCI_VDEVICE(ATHEROS, 0xff1a) }, /* 2417 arv45xx on lantiq_danube */ + { 0 } + }; + MODULE_DEVICE_TABLE(pci, ath5k_pci_id_table); |