Commit 3e2b49d6 authored by Luca Coelho's avatar Luca Coelho
Browse files

iwlwifi: don't define OTP_LOW_IMAGE_SIZE per family, but per size 



Using OTP_LOW_IMAGE_SIZE_FAMILY_8000/9000/22000 only obfuscates the
actual values, since these 3 are the same.  Redefine the values per
size so it's easier to understand and compare the different
configurations.

Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent da2eb669

drivers/net/wireless/intel/iwlwifi/cfg/1000.c

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ 
static const struct iwl_base_params iwl1000_base_params = {

	.num_of_queues = IWLAGN_NUM_QUEUES,

	.max_tfd_queue_size = 256,

	.eeprom_size = OTP_LOW_IMAGE_SIZE,

	.eeprom_size = OTP_LOW_IMAGE_SIZE_2K,

	.pll_cfg = true,

	.max_ll_items = OTP_MAX_LL_ITEMS_1000,

	.shadow_ram_support = false,

drivers/net/wireless/intel/iwlwifi/cfg/2000.c

+2 −2
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ 
#define IWL135_MODULE_FIRMWARE(api) IWL135_FW_PRE __stringify(api) ".ucode"



static const struct iwl_base_params iwl2000_base_params = {

	.eeprom_size = OTP_LOW_IMAGE_SIZE,

	.eeprom_size = OTP_LOW_IMAGE_SIZE_2K,

	.num_of_queues = IWLAGN_NUM_QUEUES,

	.max_tfd_queue_size = 256,

	.max_ll_items = OTP_MAX_LL_ITEMS_2x00,
@@ -71,7 +71,7 @@ static const struct iwl_base_params iwl2000_base_params = { 




static const struct iwl_base_params iwl2030_base_params = {

	.eeprom_size = OTP_LOW_IMAGE_SIZE,

	.eeprom_size = OTP_LOW_IMAGE_SIZE_2K,

	.num_of_queues = IWLAGN_NUM_QUEUES,

	.max_tfd_queue_size = 256,

	.max_ll_items = OTP_MAX_LL_ITEMS_2x00,

drivers/net/wireless/intel/iwlwifi/cfg/22000.c

+2 −2
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ 
#define NVM_HW_SECTION_NUM_FAMILY_22000		10



static const struct iwl_base_params iwl_22000_base_params = {

	.eeprom_size = OTP_LOW_IMAGE_SIZE_FAMILY_22000,

	.eeprom_size = OTP_LOW_IMAGE_SIZE_32K,

	.num_of_queues = 512,

	.max_tfd_queue_size = 256,

	.shadow_ram_support = true,
@@ -121,7 +121,7 @@ static const struct iwl_base_params iwl_22000_base_params = { 
};



static const struct iwl_base_params iwl_22560_base_params = {

	.eeprom_size = OTP_LOW_IMAGE_SIZE_FAMILY_22000,

	.eeprom_size = OTP_LOW_IMAGE_SIZE_32K,

	.num_of_queues = 512,

	.max_tfd_queue_size = 65536,

	.shadow_ram_support = true,

drivers/net/wireless/intel/iwlwifi/cfg/6000.c

+3 −3
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ 
#define IWL6030_MODULE_FIRMWARE(api) IWL6030_FW_PRE __stringify(api) ".ucode"



static const struct iwl_base_params iwl6000_base_params = {

	.eeprom_size = OTP_LOW_IMAGE_SIZE,

	.eeprom_size = OTP_LOW_IMAGE_SIZE_2K,

	.num_of_queues = IWLAGN_NUM_QUEUES,

	.max_tfd_queue_size = 256,

	.max_ll_items = OTP_MAX_LL_ITEMS_6x00,
@@ -79,7 +79,7 @@ static const struct iwl_base_params iwl6000_base_params = { 
};



static const struct iwl_base_params iwl6050_base_params = {

	.eeprom_size = OTP_LOW_IMAGE_SIZE,

	.eeprom_size = OTP_LOW_IMAGE_SIZE_2K,

	.num_of_queues = IWLAGN_NUM_QUEUES,

	.max_tfd_queue_size = 256,

	.max_ll_items = OTP_MAX_LL_ITEMS_6x50,
@@ -92,7 +92,7 @@ static const struct iwl_base_params iwl6050_base_params = { 
};



static const struct iwl_base_params iwl6000_g2_base_params = {

	.eeprom_size = OTP_LOW_IMAGE_SIZE,

	.eeprom_size = OTP_LOW_IMAGE_SIZE_2K,

	.num_of_queues = IWLAGN_NUM_QUEUES,

	.max_tfd_queue_size = 256,

	.max_ll_items = OTP_MAX_LL_ITEMS_6x00,

drivers/net/wireless/intel/iwlwifi/cfg/7000.c

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ 
#define NVM_HW_SECTION_NUM_FAMILY_7000		0



static const struct iwl_base_params iwl7000_base_params = {

	.eeprom_size = OTP_LOW_IMAGE_SIZE_FAMILY_7000,

	.eeprom_size = OTP_LOW_IMAGE_SIZE_16K,

	.num_of_queues = 31,

	.max_tfd_queue_size = 256,

	.shadow_ram_support = true,

CRA Git | Maintained and supported by SUSTech CRA and CCSE