diff options
author | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2011-06-06 17:26:41 -0400 |
---|---|---|
committer | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2011-06-11 10:10:48 -0400 |
commit | 8d8854d983ab7217d322269c9bd17c1f8c481ae8 (patch) | |
tree | 198e34a9219bb1a76f0e2fed5bad97e0e678a2fa | |
parent | bf300252baa383065851e2ed6af41e5f9735fe9c (diff) |
iwlagn: generic temperature location in EEPROM
Temperature location in EEPROM is generic to all devices
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-5000-hw.h | 2 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn-ucode.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-eeprom.h | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-5000-hw.h b/drivers/net/wireless/iwlwifi/iwl-5000-hw.h index 05ad47628b63..f9630a3c79fe 100644 --- a/drivers/net/wireless/iwlwifi/iwl-5000-hw.h +++ b/drivers/net/wireless/iwlwifi/iwl-5000-hw.h | |||
@@ -75,7 +75,7 @@ static inline s32 iwl_temp_calib_to_offset(struct iwl_priv *priv) | |||
75 | { | 75 | { |
76 | u16 temperature, voltage; | 76 | u16 temperature, voltage; |
77 | __le16 *temp_calib = | 77 | __le16 *temp_calib = |
78 | (__le16 *)iwl_eeprom_query_addr(priv, EEPROM_5000_TEMPERATURE); | 78 | (__le16 *)iwl_eeprom_query_addr(priv, EEPROM_TEMPERATURE); |
79 | 79 | ||
80 | temperature = le16_to_cpu(temp_calib[0]); | 80 | temperature = le16_to_cpu(temp_calib[0]); |
81 | voltage = le16_to_cpu(temp_calib[1]); | 81 | voltage = le16_to_cpu(temp_calib[1]); |
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-ucode.c b/drivers/net/wireless/iwlwifi/iwl-agn-ucode.c index e916157bd145..4be7a0f7174f 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn-ucode.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn-ucode.c | |||
@@ -197,7 +197,7 @@ static int iwlagn_set_temperature_offset_calib(struct iwl_priv *priv) | |||
197 | { | 197 | { |
198 | struct iwl_calib_temperature_offset_cmd cmd; | 198 | struct iwl_calib_temperature_offset_cmd cmd; |
199 | __le16 *offset_calib = | 199 | __le16 *offset_calib = |
200 | (__le16 *)iwl_eeprom_query_addr(priv, EEPROM_5000_TEMPERATURE); | 200 | (__le16 *)iwl_eeprom_query_addr(priv, EEPROM_TEMPERATURE); |
201 | cmd.hdr.op_code = IWL_PHY_CALIBRATE_TEMP_OFFSET_CMD; | 201 | cmd.hdr.op_code = IWL_PHY_CALIBRATE_TEMP_OFFSET_CMD; |
202 | cmd.hdr.first_group = 0; | 202 | cmd.hdr.first_group = 0; |
203 | cmd.hdr.groups_num = 1; | 203 | cmd.hdr.groups_num = 1; |
diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom.h b/drivers/net/wireless/iwlwifi/iwl-eeprom.h index 2d7005385be7..3dcb0a05d357 100644 --- a/drivers/net/wireless/iwlwifi/iwl-eeprom.h +++ b/drivers/net/wireless/iwlwifi/iwl-eeprom.h | |||
@@ -166,12 +166,12 @@ struct iwl_eeprom_enhanced_txpwr { | |||
166 | #define EEPROM_5000_TX_POWER_VERSION (4) | 166 | #define EEPROM_5000_TX_POWER_VERSION (4) |
167 | #define EEPROM_5000_EEPROM_VERSION (0x11A) | 167 | #define EEPROM_5000_EEPROM_VERSION (0x11A) |
168 | 168 | ||
169 | /* 5000 and up calibration */ | 169 | /* calibration */ |
170 | #define EEPROM_CALIB_ALL (INDIRECT_ADDRESS | INDIRECT_CALIBRATION) | 170 | #define EEPROM_CALIB_ALL (INDIRECT_ADDRESS | INDIRECT_CALIBRATION) |
171 | #define EEPROM_XTAL ((2*0x128) | EEPROM_CALIB_ALL) | 171 | #define EEPROM_XTAL ((2*0x128) | EEPROM_CALIB_ALL) |
172 | 172 | ||
173 | /* 5000 temperature */ | 173 | /* temperature */ |
174 | #define EEPROM_5000_TEMPERATURE ((2*0x12A) | EEPROM_CALIB_ALL) | 174 | #define EEPROM_TEMPERATURE ((2*0x12A) | EEPROM_CALIB_ALL) |
175 | 175 | ||
176 | /* agn links */ | 176 | /* agn links */ |
177 | #define EEPROM_LINK_HOST (2*0x64) | 177 | #define EEPROM_LINK_HOST (2*0x64) |