diff options
author | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2009-10-16 17:25:51 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-10-27 16:48:31 -0400 |
commit | 32b7e244f2b1082ac0a1cda1b088574f2d590496 (patch) | |
tree | 60a845fd0bf23ea8d2b212a313461bfb344219bc /drivers/net/wireless/iwlwifi | |
parent | c09430abed4159e5c56aaea257d040f7452daba6 (diff) |
iwlwifi: identify eeprom version for 6x50 series NIC
Adding support for 6x50 series EEPROM version check, 6x50 is wifi/wimax
combo device which has different EEPROM map
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-6000.c | 6 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-eeprom.h | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-6000.c b/drivers/net/wireless/iwlwifi/iwl-6000.c index bdc1c74b6820..e74dad3280cc 100644 --- a/drivers/net/wireless/iwlwifi/iwl-6000.c +++ b/drivers/net/wireless/iwlwifi/iwl-6000.c | |||
@@ -399,7 +399,7 @@ struct iwl_cfg iwl6050_2agn_cfg = { | |||
399 | .sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N, | 399 | .sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N, |
400 | .ops = &iwl6000_ops, | 400 | .ops = &iwl6000_ops, |
401 | .eeprom_size = OTP_LOW_IMAGE_SIZE, | 401 | .eeprom_size = OTP_LOW_IMAGE_SIZE, |
402 | .eeprom_ver = EEPROM_6000_EEPROM_VERSION, | 402 | .eeprom_ver = EEPROM_6050_EEPROM_VERSION, |
403 | .eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION, | 403 | .eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION, |
404 | .num_of_queues = IWL50_NUM_QUEUES, | 404 | .num_of_queues = IWL50_NUM_QUEUES, |
405 | .num_of_ampdu_queues = IWL50_NUM_AMPDU_QUEUES, | 405 | .num_of_ampdu_queues = IWL50_NUM_AMPDU_QUEUES, |
@@ -425,7 +425,7 @@ struct iwl_cfg iwl6050_2abg_cfg = { | |||
425 | .sku = IWL_SKU_A|IWL_SKU_G, | 425 | .sku = IWL_SKU_A|IWL_SKU_G, |
426 | .ops = &iwl6000_ops, | 426 | .ops = &iwl6000_ops, |
427 | .eeprom_size = OTP_LOW_IMAGE_SIZE, | 427 | .eeprom_size = OTP_LOW_IMAGE_SIZE, |
428 | .eeprom_ver = EEPROM_6000_EEPROM_VERSION, | 428 | .eeprom_ver = EEPROM_6050_EEPROM_VERSION, |
429 | .eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION, | 429 | .eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION, |
430 | .num_of_queues = IWL50_NUM_QUEUES, | 430 | .num_of_queues = IWL50_NUM_QUEUES, |
431 | .num_of_ampdu_queues = IWL50_NUM_AMPDU_QUEUES, | 431 | .num_of_ampdu_queues = IWL50_NUM_AMPDU_QUEUES, |
@@ -476,7 +476,7 @@ struct iwl_cfg iwl6050_3agn_cfg = { | |||
476 | .sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N, | 476 | .sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N, |
477 | .ops = &iwl6000_ops, | 477 | .ops = &iwl6000_ops, |
478 | .eeprom_size = OTP_LOW_IMAGE_SIZE, | 478 | .eeprom_size = OTP_LOW_IMAGE_SIZE, |
479 | .eeprom_ver = EEPROM_6000_EEPROM_VERSION, | 479 | .eeprom_ver = EEPROM_6050_EEPROM_VERSION, |
480 | .eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION, | 480 | .eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION, |
481 | .num_of_queues = IWL50_NUM_QUEUES, | 481 | .num_of_queues = IWL50_NUM_QUEUES, |
482 | .num_of_ampdu_queues = IWL50_NUM_AMPDU_QUEUES, | 482 | .num_of_ampdu_queues = IWL50_NUM_AMPDU_QUEUES, |
diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom.h b/drivers/net/wireless/iwlwifi/iwl-eeprom.h index b363c96fd6c6..5ba5a4e9e49a 100644 --- a/drivers/net/wireless/iwlwifi/iwl-eeprom.h +++ b/drivers/net/wireless/iwlwifi/iwl-eeprom.h | |||
@@ -261,9 +261,12 @@ struct iwl_eeprom_enhanced_txpwr { | |||
261 | /* 1000 Specific */ | 261 | /* 1000 Specific */ |
262 | #define EEPROM_1000_EEPROM_VERSION (0x15C) | 262 | #define EEPROM_1000_EEPROM_VERSION (0x15C) |
263 | 263 | ||
264 | /* 60x0 Specific */ | 264 | /* 6x00 Specific */ |
265 | #define EEPROM_6000_EEPROM_VERSION (0x434) | 265 | #define EEPROM_6000_EEPROM_VERSION (0x434) |
266 | 266 | ||
267 | /* 6x50 Specific */ | ||
268 | #define EEPROM_6050_EEPROM_VERSION (0x532) | ||
269 | |||
267 | /* OTP */ | 270 | /* OTP */ |
268 | /* lower blocks contain EEPROM image and calibration data */ | 271 | /* lower blocks contain EEPROM image and calibration data */ |
269 | #define OTP_LOW_IMAGE_SIZE (2 * 512 * sizeof(u16)) /* 2 KB */ | 272 | #define OTP_LOW_IMAGE_SIZE (2 * 512 * sizeof(u16)) /* 2 KB */ |