Commit 8d8854d9 authored by Wey-Yi Guy's avatar Wey-Yi Guy
Browse files

iwlagn: generic temperature location in EEPROM 



Temperature location in EEPROM is generic to all devices

Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
parent bf300252

drivers/net/wireless/iwlwifi/iwl-5000-hw.h

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ static inline s32 iwl_temp_calib_to_offset(struct iwl_priv *priv) 
{

	u16 temperature, voltage;

	__le16 *temp_calib =

		(__le16 *)iwl_eeprom_query_addr(priv, EEPROM_5000_TEMPERATURE);

		(__le16 *)iwl_eeprom_query_addr(priv, EEPROM_TEMPERATURE);



	temperature = le16_to_cpu(temp_calib[0]);

	voltage = le16_to_cpu(temp_calib[1]);

drivers/net/wireless/iwlwifi/iwl-agn-ucode.c

+1 −1
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ static int iwlagn_set_temperature_offset_calib(struct iwl_priv *priv) 
{

	struct iwl_calib_temperature_offset_cmd cmd;

	__le16 *offset_calib =

		(__le16 *)iwl_eeprom_query_addr(priv, EEPROM_5000_TEMPERATURE);

		(__le16 *)iwl_eeprom_query_addr(priv, EEPROM_TEMPERATURE);

	cmd.hdr.op_code = IWL_PHY_CALIBRATE_TEMP_OFFSET_CMD;

	cmd.hdr.first_group = 0;

	cmd.hdr.groups_num = 1;

drivers/net/wireless/iwlwifi/iwl-eeprom.h

+3 −3
Original line number Diff line number Diff line
@@ -166,12 +166,12 @@ struct iwl_eeprom_enhanced_txpwr { 
#define EEPROM_5000_TX_POWER_VERSION    (4)

#define EEPROM_5000_EEPROM_VERSION	(0x11A)



/* 5000 and up calibration */

/* calibration */

#define EEPROM_CALIB_ALL	(INDIRECT_ADDRESS | INDIRECT_CALIBRATION)

#define EEPROM_XTAL		((2*0x128) | EEPROM_CALIB_ALL)



/* 5000 temperature */

#define EEPROM_5000_TEMPERATURE ((2*0x12A) | EEPROM_CALIB_ALL)

/* temperature */

#define EEPROM_TEMPERATURE ((2*0x12A) | EEPROM_CALIB_ALL)



/* agn links */

#define EEPROM_LINK_HOST             (2*0x64)

CRA Git | Maintained and supported by SUSTech CRA and CCSE