--- a/drivers/net/wireless/ath/ath5k/pci.c +++ b/drivers/net/wireless/ath/ath5k/pci.c @@ -21,6 +21,7 @@ #include #include #include +#include #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--) {