ath5k: Read Spur channels from EEPROM
* Read Spur channel information from EEPROM and use default channels for RF5413 compatible chips that don't have this info on EEPROM. Signed-off-by: Nick Kossifidis <mickflemm@gmail.com> Signed-off-by: Bob Copeland <me@bobcopeland.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
committed by
John W. Linville
parent
a082381044
commit
cd41751908
@@ -1694,9 +1694,40 @@ ath5k_eeprom_read_ctl_info(struct ath5k_hw *ah)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int
|
||||
ath5k_eeprom_read_spur_chans(struct ath5k_hw *ah)
|
||||
{
|
||||
struct ath5k_eeprom_info *ee = &ah->ah_capabilities.cap_eeprom;
|
||||
u32 offset;
|
||||
u16 val;
|
||||
int ret = 0, i;
|
||||
|
||||
offset = AR5K_EEPROM_CTL(ee->ee_version) +
|
||||
AR5K_EEPROM_N_CTLS(ee->ee_version);
|
||||
|
||||
if (ee->ee_version < AR5K_EEPROM_VERSION_5_3) {
|
||||
/* No spur info for 5GHz */
|
||||
ee->ee_spur_chans[0][0] = AR5K_EEPROM_NO_SPUR;
|
||||
/* 2 channels for 2GHz (2464/2420) */
|
||||
ee->ee_spur_chans[0][1] = AR5K_EEPROM_5413_SPUR_CHAN_1;
|
||||
ee->ee_spur_chans[1][1] = AR5K_EEPROM_5413_SPUR_CHAN_2;
|
||||
ee->ee_spur_chans[2][1] = AR5K_EEPROM_NO_SPUR;
|
||||
} else if (ee->ee_version >= AR5K_EEPROM_VERSION_5_3) {
|
||||
for (i = 0; i < AR5K_EEPROM_N_SPUR_CHANS; i++) {
|
||||
AR5K_EEPROM_READ(offset, val);
|
||||
ee->ee_spur_chans[i][0] = val;
|
||||
AR5K_EEPROM_READ(offset + AR5K_EEPROM_N_SPUR_CHANS,
|
||||
val);
|
||||
ee->ee_spur_chans[i][1] = val;
|
||||
offset++;
|
||||
}
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
/*
|
||||
* Initialize eeprom power tables
|
||||
* Initialize eeprom data structure
|
||||
*/
|
||||
int
|
||||
ath5k_eeprom_init(struct ath5k_hw *ah)
|
||||
@@ -1719,6 +1750,10 @@ ath5k_eeprom_init(struct ath5k_hw *ah)
|
||||
if (err < 0)
|
||||
return err;
|
||||
|
||||
err = ath5k_eeprom_read_spur_chans(ah);
|
||||
if (err < 0)
|
||||
return err;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user