Commit 32b7e244 authored by Wey-Yi Guy's avatar Wey-Yi Guy Committed by John W. Linville
Browse files

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: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent c09430ab

drivers/net/wireless/iwlwifi/iwl-6000.c

+3 −3
Original line number Diff line number Diff line
@@ -399,7 +399,7 @@ struct iwl_cfg iwl6050_2agn_cfg = { 
	.sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N,

	.ops = &iwl6000_ops,

	.eeprom_size = OTP_LOW_IMAGE_SIZE,

	.eeprom_ver = EEPROM_6000_EEPROM_VERSION,

	.eeprom_ver = EEPROM_6050_EEPROM_VERSION,

	.eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION,

	.num_of_queues = IWL50_NUM_QUEUES,

	.num_of_ampdu_queues = IWL50_NUM_AMPDU_QUEUES,
@@ -425,7 +425,7 @@ struct iwl_cfg iwl6050_2abg_cfg = { 
	.sku = IWL_SKU_A|IWL_SKU_G,

	.ops = &iwl6000_ops,

	.eeprom_size = OTP_LOW_IMAGE_SIZE,

	.eeprom_ver = EEPROM_6000_EEPROM_VERSION,

	.eeprom_ver = EEPROM_6050_EEPROM_VERSION,

	.eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION,

	.num_of_queues = IWL50_NUM_QUEUES,

	.num_of_ampdu_queues = IWL50_NUM_AMPDU_QUEUES,
@@ -476,7 +476,7 @@ struct iwl_cfg iwl6050_3agn_cfg = { 
	.sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N,

	.ops = &iwl6000_ops,

	.eeprom_size = OTP_LOW_IMAGE_SIZE,

	.eeprom_ver = EEPROM_6000_EEPROM_VERSION,

	.eeprom_ver = EEPROM_6050_EEPROM_VERSION,

	.eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION,

	.num_of_queues = IWL50_NUM_QUEUES,

	.num_of_ampdu_queues = IWL50_NUM_AMPDU_QUEUES,

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

+4 −1
Original line number Diff line number Diff line
@@ -261,9 +261,12 @@ struct iwl_eeprom_enhanced_txpwr { 
/* 1000 Specific */

#define EEPROM_1000_EEPROM_VERSION	(0x15C)



/* 60x0 Specific */

/* 6x00 Specific */

#define EEPROM_6000_EEPROM_VERSION	(0x434)



/* 6x50 Specific */

#define EEPROM_6050_EEPROM_VERSION	(0x532)



/* OTP */

/* lower blocks contain EEPROM image and calibration data */

#define OTP_LOW_IMAGE_SIZE		(2 * 512 * sizeof(u16)) /* 2 KB */