Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 00e70590 authored by Wey-Yi Guy's avatar Wey-Yi Guy Committed by Reinette Chatre
Browse files

iwlwifi: each device has its own eeprom tx power version 



Each device has it own eeprom, so the tx power version could be
different, define TX_POWER_VERSION per device.

Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
parent e04ed0a5

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

+2 −2
Original line number Diff line number Diff line
@@ -234,7 +234,7 @@ struct iwl_cfg iwl1000_bgn_cfg = { 
	.ops = &iwl1000_ops,

	.eeprom_size = OTP_LOW_IMAGE_SIZE,

	.eeprom_ver = EEPROM_1000_EEPROM_VERSION,

	.eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION,

	.eeprom_calib_ver = EEPROM_1000_TX_POWER_VERSION,

	.num_of_queues = IWLAGN_NUM_QUEUES,

	.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,

	.mod_params = &iwl50_mod_params,
@@ -264,7 +264,7 @@ struct iwl_cfg iwl1000_bg_cfg = { 
	.ops = &iwl1000_ops,

	.eeprom_size = OTP_LOW_IMAGE_SIZE,

	.eeprom_ver = EEPROM_1000_EEPROM_VERSION,

	.eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION,

	.eeprom_calib_ver = EEPROM_1000_TX_POWER_VERSION,

	.num_of_queues = IWLAGN_NUM_QUEUES,

	.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,

	.mod_params = &iwl50_mod_params,

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

+6 −6
Original line number Diff line number Diff line
@@ -371,7 +371,7 @@ struct iwl_cfg iwl6000i_2agn_cfg = { 
	.ops = &iwl6000_ops,

	.eeprom_size = OTP_LOW_IMAGE_SIZE,

	.eeprom_ver = EEPROM_6000_EEPROM_VERSION,

	.eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION,

	.eeprom_calib_ver = EEPROM_6000_TX_POWER_VERSION,

	.num_of_queues = IWLAGN_NUM_QUEUES,

	.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,

	.mod_params = &iwl50_mod_params,
@@ -404,7 +404,7 @@ struct iwl_cfg iwl6000i_2abg_cfg = { 
	.ops = &iwl6000_ops,

	.eeprom_size = OTP_LOW_IMAGE_SIZE,

	.eeprom_ver = EEPROM_6000_EEPROM_VERSION,

	.eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION,

	.eeprom_calib_ver = EEPROM_6000_TX_POWER_VERSION,

	.num_of_queues = IWLAGN_NUM_QUEUES,

	.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,

	.mod_params = &iwl50_mod_params,
@@ -436,7 +436,7 @@ struct iwl_cfg iwl6000i_2bg_cfg = { 
	.ops = &iwl6000_ops,

	.eeprom_size = OTP_LOW_IMAGE_SIZE,

	.eeprom_ver = EEPROM_6000_EEPROM_VERSION,

	.eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION,

	.eeprom_calib_ver = EEPROM_6000_TX_POWER_VERSION,

	.num_of_queues = IWLAGN_NUM_QUEUES,

	.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,

	.mod_params = &iwl50_mod_params,
@@ -468,7 +468,7 @@ struct iwl_cfg iwl6050_2agn_cfg = { 
	.ops = &iwl6050_ops,

	.eeprom_size = OTP_LOW_IMAGE_SIZE,

	.eeprom_ver = EEPROM_6050_EEPROM_VERSION,

	.eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION,

	.eeprom_calib_ver = EEPROM_6050_TX_POWER_VERSION,

	.num_of_queues = IWLAGN_NUM_QUEUES,

	.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,

	.mod_params = &iwl50_mod_params,
@@ -501,7 +501,7 @@ struct iwl_cfg iwl6050_2abg_cfg = { 
	.ops = &iwl6050_ops,

	.eeprom_size = OTP_LOW_IMAGE_SIZE,

	.eeprom_ver = EEPROM_6050_EEPROM_VERSION,

	.eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION,

	.eeprom_calib_ver = EEPROM_6050_TX_POWER_VERSION,

	.num_of_queues = IWLAGN_NUM_QUEUES,

	.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,

	.mod_params = &iwl50_mod_params,
@@ -533,7 +533,7 @@ struct iwl_cfg iwl6000_3agn_cfg = { 
	.ops = &iwl6000_ops,

	.eeprom_size = OTP_LOW_IMAGE_SIZE,

	.eeprom_ver = EEPROM_6000_EEPROM_VERSION,

	.eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION,

	.eeprom_calib_ver = EEPROM_6000_TX_POWER_VERSION,

	.num_of_queues = IWLAGN_NUM_QUEUES,

	.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,

	.mod_params = &iwl50_mod_params,

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

+3 −0
Original line number Diff line number Diff line
@@ -261,12 +261,15 @@ struct iwl_eeprom_enhanced_txpwr { 
#define EEPROM_5050_EEPROM_VERSION	(0x21E)



/* 1000 Specific */

#define EEPROM_1000_TX_POWER_VERSION    (4)

#define EEPROM_1000_EEPROM_VERSION	(0x15C)



/* 6x00 Specific */

#define EEPROM_6000_TX_POWER_VERSION    (4)

#define EEPROM_6000_EEPROM_VERSION	(0x434)



/* 6x50 Specific */

#define EEPROM_6050_TX_POWER_VERSION    (4)

#define EEPROM_6050_EEPROM_VERSION	(0x532)



/* OTP */