mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-04-21 12:27:27 +03:00
mac80211: ath9k: allow to load EEPROM data via firmware API
Signed-off-by: Gabor Juhos <juhosg@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34606 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
--- a/drivers/net/wireless/ath/ath9k/eeprom_def.c
|
||||
+++ b/drivers/net/wireless/ath/ath9k/eeprom_def.c
|
||||
@@ -266,7 +266,7 @@ static int ath9k_hw_def_check_eeprom(str
|
||||
@@ -262,7 +262,7 @@ static int ath9k_hw_def_check_eeprom(str
|
||||
{
|
||||
struct ar5416_eeprom_def *eep = &ah->eeprom.def;
|
||||
struct ath_common *common = ath9k_hw_common(ah);
|
||||
@@ -9,7 +9,7 @@
|
||||
u32 sum = 0, el;
|
||||
bool need_swap = false;
|
||||
int i, addr, size;
|
||||
@@ -276,27 +276,16 @@ static int ath9k_hw_def_check_eeprom(str
|
||||
@@ -272,27 +272,16 @@ static int ath9k_hw_def_check_eeprom(str
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -49,29 +49,29 @@
|
||||
|
||||
--- a/drivers/net/wireless/ath/ath9k/eeprom_4k.c
|
||||
+++ b/drivers/net/wireless/ath/ath9k/eeprom_4k.c
|
||||
@@ -195,7 +195,7 @@ static int ath9k_hw_4k_check_eeprom(stru
|
||||
int i, addr;
|
||||
|
||||
|
||||
- if (!ath9k_hw_use_flash(ah)) {
|
||||
+ if (!(ah->ah_flags & AH_NO_EEP_SWAP)) {
|
||||
if (!ath9k_hw_nvram_read(common, AR5416_EEPROM_MAGIC_OFFSET,
|
||||
&magic)) {
|
||||
ath_err(common, "Reading Magic # failed\n");
|
||||
--- a/drivers/net/wireless/ath/ath9k/eeprom_9287.c
|
||||
+++ b/drivers/net/wireless/ath/ath9k/eeprom_9287.c
|
||||
@@ -189,7 +189,7 @@ static int ath9k_hw_ar9287_check_eeprom(
|
||||
struct ar9287_eeprom *eep = &ah->eeprom.map9287;
|
||||
@@ -57,7 +57,7 @@ static bool ath9k_hw_4k_fill_eeprom(stru
|
||||
{
|
||||
struct ath_common *common = ath9k_hw_common(ah);
|
||||
|
||||
- if (!ath9k_hw_use_flash(ah)) {
|
||||
+ if (!(ah->ah_flags & AH_NO_EEP_SWAP)) {
|
||||
if (!ath9k_hw_nvram_read(common, AR5416_EEPROM_MAGIC_OFFSET,
|
||||
&magic)) {
|
||||
ath_err(common, "Reading Magic # failed\n");
|
||||
ath_dbg(common, EEPROM, "Reading from EEPROM, not flash\n");
|
||||
}
|
||||
|
||||
--- a/drivers/net/wireless/ath/ath9k/eeprom_9287.c
|
||||
+++ b/drivers/net/wireless/ath/ath9k/eeprom_9287.c
|
||||
@@ -60,7 +60,7 @@ static bool ath9k_hw_ar9287_fill_eeprom(
|
||||
{
|
||||
struct ath_common *common = ath9k_hw_common(ah);
|
||||
|
||||
- if (!ath9k_hw_use_flash(ah)) {
|
||||
+ if (!(ah->ah_flags & AH_NO_EEP_SWAP)) {
|
||||
ath_dbg(common, EEPROM, "Reading from EEPROM, not flash\n");
|
||||
}
|
||||
|
||||
--- a/drivers/net/wireless/ath/ath9k/hw.h
|
||||
+++ b/drivers/net/wireless/ath/ath9k/hw.h
|
||||
@@ -704,6 +704,7 @@ enum ath_cal_list {
|
||||
@@ -705,6 +705,7 @@ enum ath_cal_list {
|
||||
#define AH_USE_EEPROM 0x1
|
||||
#define AH_UNPLUGGED 0x2 /* The card has been physically removed. */
|
||||
#define AH_FASTCC 0x4
|
||||
@@ -81,7 +81,7 @@
|
||||
struct ath_ops reg_ops;
|
||||
--- a/drivers/net/wireless/ath/ath9k/init.c
|
||||
+++ b/drivers/net/wireless/ath/ath9k/init.c
|
||||
@@ -541,6 +541,8 @@ static int ath9k_init_softc(u16 devid, s
|
||||
@@ -591,6 +591,8 @@ static int ath9k_init_softc(u16 devid, s
|
||||
ah->is_clk_25mhz = pdata->is_clk_25mhz;
|
||||
ah->get_mac_revision = pdata->get_mac_revision;
|
||||
ah->external_reset = pdata->external_reset;
|
||||
@@ -92,7 +92,7 @@
|
||||
common = ath9k_hw_common(ah);
|
||||
--- a/include/linux/ath9k_platform.h
|
||||
+++ b/include/linux/ath9k_platform.h
|
||||
@@ -29,6 +29,7 @@ struct ath9k_platform_data {
|
||||
@@ -31,6 +31,7 @@ struct ath9k_platform_data {
|
||||
u32 gpio_mask;
|
||||
u32 gpio_val;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user