Commit 35ac275e authored by Johannes Berg's avatar Johannes Berg Committed by Miri Korenblit
Browse files

wifi: iwlwifi: cfg: finish config split 



A long time ago, when transport vs. device configs were
introduced, we wanted to eventually have a list of PCI
IDs and a separate list of devices, but for simplicity
embedded the transport config in the whole config, and
it all got confusing.

Finish splitting that out. Doing so requires having more
IWL_DEV_INFO() entries, but the whole trans/cfg aliasing
goes away and the code becomes a lot simpler.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarMiri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20250502155404.e03f65c0f693.I076a997f800db455b575008f9488b151738ad7ec@changeid
parent 3bf7c398

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

+14 −9
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
/******************************************************************************

 *

 * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2018 - 2020, 2023 Intel Corporation

 * Copyright(c) 2018 - 2020, 2023, 2025 Intel Corporation

 *****************************************************************************/



#include <linux/module.h>
@@ -60,54 +60,59 @@ static const struct iwl_eeprom_params iwl1000_eeprom_params = { 
	}

};



const struct iwl_cfg_trans_params iwl1000_trans_cfg = {

	.device_family = IWL_DEVICE_FAMILY_1000,

	.base_params = &iwl1000_base_params,

};



#define IWL_DEVICE_1000						\

	.fw_name_pre = IWL1000_FW_PRE,				\

	.ucode_api_max = IWL1000_UCODE_API_MAX,			\

	.ucode_api_min = IWL1000_UCODE_API_MIN,			\

	.trans.device_family = IWL_DEVICE_FAMILY_1000,		\

	.max_inst_size = IWLAGN_RTC_INST_SIZE,			\

	.max_data_size = IWLAGN_RTC_DATA_SIZE,			\

	.nvm_ver = EEPROM_1000_EEPROM_VERSION,		\

	.nvm_calib_ver = EEPROM_1000_TX_POWER_VERSION,	\

	.trans.base_params = &iwl1000_base_params,		\

	.eeprom_params = &iwl1000_eeprom_params,		\

	.led_mode = IWL_LED_BLINK



const struct iwl_cfg iwl1000_bgn_cfg = {

	.name = "Intel(R) Centrino(R) Wireless-N 1000 BGN",

	IWL_DEVICE_1000,

	.ht_params = &iwl1000_ht_params,

};



const char iwl1000_bgn_name[] = "Intel(R) Centrino(R) Wireless-N 1000 BGN";



const struct iwl_cfg iwl1000_bg_cfg = {

	.name = "Intel(R) Centrino(R) Wireless-N 1000 BG",

	IWL_DEVICE_1000,

};



const char iwl1000_bg_name[] = "Intel(R) Centrino(R) Wireless-N 1000 BG";



#define IWL_DEVICE_100						\

	.fw_name_pre = IWL100_FW_PRE,				\

	.ucode_api_max = IWL100_UCODE_API_MAX,			\

	.ucode_api_min = IWL100_UCODE_API_MIN,			\

	.trans.device_family = IWL_DEVICE_FAMILY_100,		\

	.max_inst_size = IWLAGN_RTC_INST_SIZE,			\

	.max_data_size = IWLAGN_RTC_DATA_SIZE,			\

	.nvm_ver = EEPROM_1000_EEPROM_VERSION,		\

	.nvm_calib_ver = EEPROM_1000_TX_POWER_VERSION,	\

	.trans.base_params = &iwl1000_base_params,		\

	.eeprom_params = &iwl1000_eeprom_params,		\

	.led_mode = IWL_LED_RF_STATE,				\

	.rx_with_siso_diversity = true



const struct iwl_cfg iwl100_bgn_cfg = {

	.name = "Intel(R) Centrino(R) Wireless-N 100 BGN",

	IWL_DEVICE_100,

	.ht_params = &iwl1000_ht_params,

};



const char iwl100_bgn_name[] = "Intel(R) Centrino(R) Wireless-N 100 BGN";



const struct iwl_cfg iwl100_bg_cfg = {

	.name = "Intel(R) Centrino(R) Wireless-N 100 BG",

	IWL_DEVICE_100,

};



const char iwl100_bg_name[] = "Intel(R) Centrino(R) Wireless-N 100 BG";



MODULE_FIRMWARE(IWL1000_MODULE_FIRMWARE(IWL1000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL100_MODULE_FIRMWARE(IWL100_UCODE_API_MAX));

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

+27 −21
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
/******************************************************************************

 *

 * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2018 - 2020, 2023 Intel Corporation

 * Copyright(c) 2018 - 2020, 2023, 2025 Intel Corporation

 *****************************************************************************/



#include <linux/module.h>
@@ -86,97 +86,103 @@ static const struct iwl_eeprom_params iwl20x0_eeprom_params = { 
	.enhanced_txpower = true,

};



const struct iwl_cfg_trans_params iwl2000_trans_cfg = {

	.device_family = IWL_DEVICE_FAMILY_2000,

	.base_params = &iwl2000_base_params,

};



#define IWL_DEVICE_2000						\

	.fw_name_pre = IWL2000_FW_PRE,				\

	.ucode_api_max = IWL2000_UCODE_API_MAX,			\

	.ucode_api_min = IWL2000_UCODE_API_MIN,			\

	.trans.device_family = IWL_DEVICE_FAMILY_2000,		\

	.max_inst_size = IWL60_RTC_INST_SIZE,			\

	.max_data_size = IWL60_RTC_DATA_SIZE,			\

	.nvm_ver = EEPROM_2000_EEPROM_VERSION,			\

	.nvm_calib_ver = EEPROM_2000_TX_POWER_VERSION,		\

	.trans.base_params = &iwl2000_base_params,		\

	.eeprom_params = &iwl20x0_eeprom_params,		\

	.led_mode = IWL_LED_RF_STATE





const struct iwl_cfg iwl2000_2bgn_cfg = {

	.name = "Intel(R) Centrino(R) Wireless-N 2200 BGN",

	IWL_DEVICE_2000,

	.ht_params = &iwl2000_ht_params,

};



const struct iwl_cfg iwl2000_2bgn_d_cfg = {

	.name = "Intel(R) Centrino(R) Wireless-N 2200D BGN",

	IWL_DEVICE_2000,

	.ht_params = &iwl2000_ht_params,

const char iwl2000_2bgn_name[] = "Intel(R) Centrino(R) Wireless-N 2200 BGN";

const char iwl2000_2bgn_d_name[] = "Intel(R) Centrino(R) Wireless-N 2200D BGN";



const struct iwl_cfg_trans_params iwl2030_trans_cfg = {

	.device_family = IWL_DEVICE_FAMILY_2030,

	.base_params = &iwl2030_base_params,

};



#define IWL_DEVICE_2030						\

	.fw_name_pre = IWL2030_FW_PRE,				\

	.ucode_api_max = IWL2030_UCODE_API_MAX,			\

	.ucode_api_min = IWL2030_UCODE_API_MIN,			\

	.trans.device_family = IWL_DEVICE_FAMILY_2030,		\

	.max_inst_size = IWL60_RTC_INST_SIZE,			\

	.max_data_size = IWL60_RTC_DATA_SIZE,			\

	.nvm_ver = EEPROM_2000_EEPROM_VERSION,		\

	.nvm_calib_ver = EEPROM_2000_TX_POWER_VERSION,	\

	.trans.base_params = &iwl2030_base_params,		\

	.eeprom_params = &iwl20x0_eeprom_params,		\

	.led_mode = IWL_LED_RF_STATE



const struct iwl_cfg iwl2030_2bgn_cfg = {

	.name = "Intel(R) Centrino(R) Wireless-N 2230 BGN",

	IWL_DEVICE_2030,

	.ht_params = &iwl2000_ht_params,

};



const char iwl2030_2bgn_name[] = "Intel(R) Centrino(R) Wireless-N 2230 BGN";



const struct iwl_cfg_trans_params iwl105_trans_cfg = {

	.device_family = IWL_DEVICE_FAMILY_105,

	.base_params = &iwl2000_base_params,

};



#define IWL_DEVICE_105						\

	.fw_name_pre = IWL105_FW_PRE,				\

	.ucode_api_max = IWL105_UCODE_API_MAX,			\

	.ucode_api_min = IWL105_UCODE_API_MIN,			\

	.trans.device_family = IWL_DEVICE_FAMILY_105,		\

	.max_inst_size = IWL60_RTC_INST_SIZE,			\

	.max_data_size = IWL60_RTC_DATA_SIZE,			\

	.nvm_ver = EEPROM_2000_EEPROM_VERSION,		\

	.nvm_calib_ver = EEPROM_2000_TX_POWER_VERSION,	\

	.trans.base_params = &iwl2000_base_params,		\

	.eeprom_params = &iwl20x0_eeprom_params,		\

	.led_mode = IWL_LED_RF_STATE,				\

	.rx_with_siso_diversity = true



const struct iwl_cfg iwl105_bgn_cfg = {

	.name = "Intel(R) Centrino(R) Wireless-N 105 BGN",

	IWL_DEVICE_105,

	.ht_params = &iwl2000_ht_params,

};



const struct iwl_cfg iwl105_bgn_d_cfg = {

	.name = "Intel(R) Centrino(R) Wireless-N 105D BGN",

	IWL_DEVICE_105,

	.ht_params = &iwl2000_ht_params,

const char iwl105_bgn_name[] = "Intel(R) Centrino(R) Wireless-N 105 BGN";

const char iwl105_bgn_d_name[] = "Intel(R) Centrino(R) Wireless-N 105D BGN";



const struct iwl_cfg_trans_params iwl135_trans_cfg = {

	.device_family = IWL_DEVICE_FAMILY_135,

	.base_params = &iwl2030_base_params,

};



#define IWL_DEVICE_135						\

	.fw_name_pre = IWL135_FW_PRE,				\

	.ucode_api_max = IWL135_UCODE_API_MAX,			\

	.ucode_api_min = IWL135_UCODE_API_MIN,			\

	.trans.device_family = IWL_DEVICE_FAMILY_135,		\

	.max_inst_size = IWL60_RTC_INST_SIZE,			\

	.max_data_size = IWL60_RTC_DATA_SIZE,			\

	.nvm_ver = EEPROM_2000_EEPROM_VERSION,		\

	.nvm_calib_ver = EEPROM_2000_TX_POWER_VERSION,	\

	.trans.base_params = &iwl2030_base_params,		\

	.eeprom_params = &iwl20x0_eeprom_params,		\

	.led_mode = IWL_LED_RF_STATE,				\

	.rx_with_siso_diversity = true



const struct iwl_cfg iwl135_bgn_cfg = {

	.name = "Intel(R) Centrino(R) Wireless-N 135 BGN",

	IWL_DEVICE_135,

	.ht_params = &iwl2000_ht_params,

};



const char iwl135_bgn_name[] = "Intel(R) Centrino(R) Wireless-N 135 BGN";



MODULE_FIRMWARE(IWL2000_MODULE_FIRMWARE(IWL2000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL2030_MODULE_FIRMWARE(IWL2030_UCODE_API_MAX));

MODULE_FIRMWARE(IWL105_MODULE_FIRMWARE(IWL105_UCODE_API_MAX));

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

+0 −5
Original line number Diff line number Diff line
@@ -81,13 +81,10 @@ const struct iwl_ht_params iwl_22000_ht_params = { 
	.smem_len = IWL_22000_SMEM_LEN,					\

	.features = IWL_TX_CSUM_NETIF_FLAGS | NETIF_F_RXCSUM,		\

	.apmg_not_supported = true,					\

	.trans.mq_rx_supported = true,					\

	.vht_mu_mimo_supported = true,					\

	.mac_addr_from_csr = 0x380,					\

	.ht_params = &iwl_22000_ht_params,				\

	.nvm_ver = IWL_22000_NVM_VERSION,				\

	.trans.rf_id = true,						\

	.trans.gen2 = true,						\

	.nvm_type = IWL_NVM_EXT,					\

	.dbgc_supported = true,						\

	.min_umac_error_event_table = 0x400000,				\
@@ -107,8 +104,6 @@ const struct iwl_ht_params iwl_22000_ht_params = { 
#define IWL_DEVICE_22500						\

	IWL_DEVICE_22000_COMMON,					\

	.ucode_api_max = IWL_22000_UCODE_API_MAX,			\

	.trans.device_family = IWL_DEVICE_FAMILY_22000,			\

	.trans.base_params = &iwl_22000_base_params,			\

	.gp2_reg_addr = 0xa02c68,					\

	.mon_dram_regs = {						\

		.write_ptr = {						\

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

+24 −21
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
/******************************************************************************

 *

 * Copyright(c) 2007 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2018 - 2020, 2023 Intel Corporation

 * Copyright(c) 2018 - 2020, 2023, 2025 Intel Corporation

 *****************************************************************************/



#include <linux/module.h>
@@ -58,21 +58,23 @@ static const struct iwl_eeprom_params iwl5000_eeprom_params = { 
	},

};



const struct iwl_cfg_trans_params iwl5000_trans_cfg = {

	.device_family = IWL_DEVICE_FAMILY_5000,

	.base_params = &iwl5000_base_params,

};



#define IWL_DEVICE_5000						\

	.fw_name_pre = IWL5000_FW_PRE,				\

	.ucode_api_max = IWL5000_UCODE_API_MAX,			\

	.ucode_api_min = IWL5000_UCODE_API_MIN,			\

	.trans.device_family = IWL_DEVICE_FAMILY_5000,		\

	.max_inst_size = IWLAGN_RTC_INST_SIZE,			\

	.max_data_size = IWLAGN_RTC_DATA_SIZE,			\

	.nvm_ver = EEPROM_5000_EEPROM_VERSION,		\

	.nvm_calib_ver = EEPROM_5000_TX_POWER_VERSION,	\

	.trans.base_params = &iwl5000_base_params,		\

	.eeprom_params = &iwl5000_eeprom_params,		\

	.led_mode = IWL_LED_BLINK



const struct iwl_cfg iwl5300_agn_cfg = {

	.name = "Intel(R) Ultimate N WiFi Link 5300 AGN",

	IWL_DEVICE_5000,

	/* at least EEPROM 0x11A has wrong info */

	.valid_tx_ant = ANT_ABC,	/* .cfg overwrite */
@@ -80,71 +82,72 @@ const struct iwl_cfg iwl5300_agn_cfg = { 
	.ht_params = &iwl5000_ht_params,

};



const struct iwl_cfg iwl5100_bgn_cfg = {

	.name = "Intel(R) WiFi Link 5100 BGN",

const char iwl5300_agn_name[] = "Intel(R) Ultimate N WiFi Link 5300 AGN";



const struct iwl_cfg iwl5100_n_cfg = {

	IWL_DEVICE_5000,

	.valid_tx_ant = ANT_B,		/* .cfg overwrite */

	.valid_rx_ant = ANT_AB,		/* .cfg overwrite */

	.ht_params = &iwl5000_ht_params,

};



const char iwl5100_bgn_name[] = "Intel(R) WiFi Link 5100 BGN";



const struct iwl_cfg iwl5100_abg_cfg = {

	.name = "Intel(R) WiFi Link 5100 ABG",

	IWL_DEVICE_5000,

	.valid_tx_ant = ANT_B,		/* .cfg overwrite */

	.valid_rx_ant = ANT_AB,		/* .cfg overwrite */

};



const struct iwl_cfg iwl5100_agn_cfg = {

	.name = "Intel(R) WiFi Link 5100 AGN",

	IWL_DEVICE_5000,

	.valid_tx_ant = ANT_B,		/* .cfg overwrite */

	.valid_rx_ant = ANT_AB,		/* .cfg overwrite */

	.ht_params = &iwl5000_ht_params,

};

const char iwl5100_abg_name[] = "Intel(R) WiFi Link 5100 ABG";

const char iwl5100_agn_name[] = "Intel(R) WiFi Link 5100 AGN";



const struct iwl_cfg iwl5350_agn_cfg = {

	.name = "Intel(R) WiMAX/WiFi Link 5350 AGN",

	.fw_name_pre = IWL5000_FW_PRE,

	.ucode_api_max = IWL5000_UCODE_API_MAX,

	.ucode_api_min = IWL5000_UCODE_API_MIN,

	.trans.device_family = IWL_DEVICE_FAMILY_5000,

	.max_inst_size = IWLAGN_RTC_INST_SIZE,

	.max_data_size = IWLAGN_RTC_DATA_SIZE,

	.nvm_ver = EEPROM_5050_EEPROM_VERSION,

	.nvm_calib_ver = EEPROM_5050_TX_POWER_VERSION,

	.trans.base_params = &iwl5000_base_params,

	.eeprom_params = &iwl5000_eeprom_params,

	.ht_params = &iwl5000_ht_params,

	.led_mode = IWL_LED_BLINK,

	.internal_wimax_coex = true,

};



const char iwl5350_agn_name[] = "Intel(R) WiMAX/WiFi Link 5350 AGN";



const struct iwl_cfg_trans_params iwl5150_trans_cfg = {

	.device_family = IWL_DEVICE_FAMILY_5150,

	.base_params = &iwl5000_base_params,

};



#define IWL_DEVICE_5150						\

	.fw_name_pre = IWL5150_FW_PRE,				\

	.ucode_api_max = IWL5150_UCODE_API_MAX,			\

	.ucode_api_min = IWL5150_UCODE_API_MIN,			\

	.trans.device_family = IWL_DEVICE_FAMILY_5150,		\

	.max_inst_size = IWLAGN_RTC_INST_SIZE,			\

	.max_data_size = IWLAGN_RTC_DATA_SIZE,			\

	.nvm_ver = EEPROM_5050_EEPROM_VERSION,		\

	.nvm_calib_ver = EEPROM_5050_TX_POWER_VERSION,	\

	.trans.base_params = &iwl5000_base_params,		\

	.eeprom_params = &iwl5000_eeprom_params,		\

	.led_mode = IWL_LED_BLINK,				\

	.internal_wimax_coex = true



const struct iwl_cfg iwl5150_agn_cfg = {

	.name = "Intel(R) WiMAX/WiFi Link 5150 AGN",

	IWL_DEVICE_5150,

	.ht_params = &iwl5000_ht_params,



};



const char iwl5150_agn_name[] = "Intel(R) WiMAX/WiFi Link 5150 AGN";



const struct iwl_cfg iwl5150_abg_cfg = {

	.name = "Intel(R) WiMAX/WiFi Link 5150 ABG",

	IWL_DEVICE_5150,

};



const char iwl5150_abg_name[] = "Intel(R) WiMAX/WiFi Link 5150 ABG";



MODULE_FIRMWARE(IWL5000_MODULE_FIRMWARE(IWL5000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL5150_MODULE_FIRMWARE(IWL5150_UCODE_API_MAX));

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

+66 −87
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
/******************************************************************************

 *

 * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2018 - 2020, 2023 Intel Corporation

 * Copyright(c) 2018 - 2020, 2023, 2025 Intel Corporation

 *****************************************************************************/



#include <linux/module.h>
@@ -107,143 +107,112 @@ static const struct iwl_eeprom_params iwl6000_eeprom_params = { 
	.enhanced_txpower = true,

};



const struct iwl_cfg_trans_params iwl6005_trans_cfg = {

	.device_family = IWL_DEVICE_FAMILY_6005,

	.base_params = &iwl6000_g2_base_params,

};



#define IWL_DEVICE_6005						\

	.fw_name_pre = IWL6005_FW_PRE,				\

	.ucode_api_max = IWL6000G2_UCODE_API_MAX,		\

	.ucode_api_min = IWL6000G2_UCODE_API_MIN,		\

	.trans.device_family = IWL_DEVICE_FAMILY_6005,		\

	.max_inst_size = IWL60_RTC_INST_SIZE,			\

	.max_data_size = IWL60_RTC_DATA_SIZE,			\

	.nvm_ver = EEPROM_6005_EEPROM_VERSION,		\

	.nvm_calib_ver = EEPROM_6005_TX_POWER_VERSION,	\

	.trans.base_params = &iwl6000_g2_base_params,		\

	.eeprom_params = &iwl6000_eeprom_params,		\

	.led_mode = IWL_LED_RF_STATE



const struct iwl_cfg iwl6005_2agn_cfg = {

	.name = "Intel(R) Centrino(R) Advanced-N 6205 AGN",

const struct iwl_cfg iwl6005_n_cfg = {

	IWL_DEVICE_6005,

	.ht_params = &iwl6000_ht_params,

};



const struct iwl_cfg iwl6005_2abg_cfg = {

	.name = "Intel(R) Centrino(R) Advanced-N 6205 ABG",

	IWL_DEVICE_6005,

};



const struct iwl_cfg iwl6005_2bg_cfg = {

	.name = "Intel(R) Centrino(R) Advanced-N 6205 BG",

	IWL_DEVICE_6005,

};



const struct iwl_cfg iwl6005_2agn_sff_cfg = {

	.name = "Intel(R) Centrino(R) Advanced-N 6205S AGN",

	IWL_DEVICE_6005,

	.ht_params = &iwl6000_ht_params,

};

const char iwl6005_2agn_name[] = "Intel(R) Centrino(R) Advanced-N 6205 AGN";

const char iwl6005_2agn_sff_name[] = "Intel(R) Centrino(R) Advanced-N 6205S AGN";

const char iwl6005_2agn_d_name[] = "Intel(R) Centrino(R) Advanced-N 6205D AGN";

const char iwl6005_2agn_mow1_name[] = "Intel(R) Centrino(R) Advanced-N 6206 AGN";

const char iwl6005_2agn_mow2_name[] = "Intel(R) Centrino(R) Advanced-N 6207 AGN";



const struct iwl_cfg iwl6005_2agn_d_cfg = {

	.name = "Intel(R) Centrino(R) Advanced-N 6205D AGN",

const struct iwl_cfg iwl6005_non_n_cfg = {

	IWL_DEVICE_6005,

	.ht_params = &iwl6000_ht_params,

};



const struct iwl_cfg iwl6005_2agn_mow1_cfg = {

	.name = "Intel(R) Centrino(R) Advanced-N 6206 AGN",

	IWL_DEVICE_6005,

	.ht_params = &iwl6000_ht_params,

};

const char iwl6005_2abg_name[] = "Intel(R) Centrino(R) Advanced-N 6205 ABG";

const char iwl6005_2bg_name[] = "Intel(R) Centrino(R) Advanced-N 6205 BG";



const struct iwl_cfg iwl6005_2agn_mow2_cfg = {

	.name = "Intel(R) Centrino(R) Advanced-N 6207 AGN",

	IWL_DEVICE_6005,

	.ht_params = &iwl6000_ht_params,

const struct iwl_cfg_trans_params iwl6030_trans_cfg = {

	.device_family = IWL_DEVICE_FAMILY_6030,

	.base_params = &iwl6000_g2_base_params,

};



#define IWL_DEVICE_6030						\

	.fw_name_pre = IWL6030_FW_PRE,				\

	.ucode_api_max = IWL6000G2_UCODE_API_MAX,		\

	.ucode_api_min = IWL6000G2_UCODE_API_MIN,		\

	.trans.device_family = IWL_DEVICE_FAMILY_6030,		\

	.max_inst_size = IWL60_RTC_INST_SIZE,			\

	.max_data_size = IWL60_RTC_DATA_SIZE,			\

	.nvm_ver = EEPROM_6030_EEPROM_VERSION,		\

	.nvm_calib_ver = EEPROM_6030_TX_POWER_VERSION,	\

	.trans.base_params = &iwl6000_g2_base_params,		\

	.eeprom_params = &iwl6000_eeprom_params,		\

	.led_mode = IWL_LED_RF_STATE



const struct iwl_cfg iwl6030_2agn_cfg = {

	.name = "Intel(R) Centrino(R) Advanced-N 6230 AGN",

const struct iwl_cfg iwl6030_n_cfg = {

	IWL_DEVICE_6030,

	.ht_params = &iwl6000_ht_params,

};



const struct iwl_cfg iwl6030_2abg_cfg = {

	.name = "Intel(R) Centrino(R) Advanced-N 6230 ABG",

	IWL_DEVICE_6030,

};

const char iwl6030_2agn_name[] = "Intel(R) Centrino(R) Advanced-N 6230 AGN";

const char iwl6030_2bgn_name[] = "Intel(R) Centrino(R) Advanced-N 6230 BGN";

const char iwl1030_bgn_name[] = "Intel(R) Centrino(R) Wireless-N 1030 BGN";

const char iwl1030_bg_name[] = "Intel(R) Centrino(R) Wireless-N 1030 BG";



const struct iwl_cfg iwl6030_2bgn_cfg = {

	.name = "Intel(R) Centrino(R) Advanced-N 6230 BGN",

const struct iwl_cfg iwl6030_non_n_cfg = {

	IWL_DEVICE_6030,

	.ht_params = &iwl6000_ht_params,

};



const struct iwl_cfg iwl6030_2bg_cfg = {

	.name = "Intel(R) Centrino(R) Advanced-N 6230 BG",

	IWL_DEVICE_6030,

};

const char iwl6030_2abg_name[] = "Intel(R) Centrino(R) Advanced-N 6230 ABG";

const char iwl6030_2bg_name[] = "Intel(R) Centrino(R) Advanced-N 6230 BG";



#define IWL_DEVICE_6035						\

	.fw_name_pre = IWL6030_FW_PRE,				\

	.ucode_api_max = IWL6035_UCODE_API_MAX,			\

	.ucode_api_min = IWL6035_UCODE_API_MIN,			\

	.trans.device_family = IWL_DEVICE_FAMILY_6030,		\

	.max_inst_size = IWL60_RTC_INST_SIZE,			\

	.max_data_size = IWL60_RTC_DATA_SIZE,			\

	.nvm_ver = EEPROM_6030_EEPROM_VERSION,		\

	.nvm_calib_ver = EEPROM_6030_TX_POWER_VERSION,	\

	.trans.base_params = &iwl6000_g2_base_params,		\

	.eeprom_params = &iwl6000_eeprom_params,		\

	.led_mode = IWL_LED_RF_STATE



const struct iwl_cfg iwl6035_2agn_cfg = {

	.name = "Intel(R) Centrino(R) Advanced-N 6235 AGN",

	IWL_DEVICE_6035,

	.ht_params = &iwl6000_ht_params,

};



const struct iwl_cfg iwl6035_2agn_sff_cfg = {

	.name = "Intel(R) Centrino(R) Ultimate-N 6235 AGN",

	IWL_DEVICE_6035,

	.ht_params = &iwl6000_ht_params,

};



const struct iwl_cfg iwl1030_bgn_cfg = {

	.name = "Intel(R) Centrino(R) Wireless-N 1030 BGN",

	IWL_DEVICE_6030,

	.ht_params = &iwl6000_ht_params,

};



const struct iwl_cfg iwl1030_bg_cfg = {

	.name = "Intel(R) Centrino(R) Wireless-N 1030 BG",

	IWL_DEVICE_6030,

};

const char iwl6035_2agn_name[] = "Intel(R) Centrino(R) Advanced-N 6235 AGN";

const char iwl6035_2agn_sff_name[] = "Intel(R) Centrino(R) Ultimate-N 6235 AGN";



const struct iwl_cfg iwl130_bgn_cfg = {

	.name = "Intel(R) Centrino(R) Wireless-N 130 BGN",

	IWL_DEVICE_6030,

	.ht_params = &iwl6000_ht_params,

	.rx_with_siso_diversity = true,

};



const char iwl130_bgn_name[] = "Intel(R) Centrino(R) Wireless-N 130 BGN";



const struct iwl_cfg iwl130_bg_cfg = {

	.name = "Intel(R) Centrino(R) Wireless-N 130 BG",

	IWL_DEVICE_6030,

	.rx_with_siso_diversity = true,

};



const char iwl130_bg_name[] = "Intel(R) Centrino(R) Wireless-N 130 BG";



const struct iwl_cfg_trans_params iwl6000i_trans_cfg = {

	.device_family = IWL_DEVICE_FAMILY_6000i,

	.base_params = &iwl6000_base_params,

};



/*

 * "i": Internal configuration, use internal Power Amplifier

 */
@@ -251,101 +220,111 @@ const struct iwl_cfg iwl130_bg_cfg = { 
	.fw_name_pre = IWL6000_FW_PRE,				\

	.ucode_api_max = IWL6000_UCODE_API_MAX,			\

	.ucode_api_min = IWL6000_UCODE_API_MIN,			\

	.trans.device_family = IWL_DEVICE_FAMILY_6000i,		\

	.max_inst_size = IWL60_RTC_INST_SIZE,			\

	.max_data_size = IWL60_RTC_DATA_SIZE,			\

	.valid_tx_ant = ANT_BC,		/* .cfg overwrite */	\

	.valid_rx_ant = ANT_BC,		/* .cfg overwrite */	\

	.nvm_ver = EEPROM_6000_EEPROM_VERSION,		\

	.nvm_calib_ver = EEPROM_6000_TX_POWER_VERSION,	\

	.trans.base_params = &iwl6000_base_params,		\

	.eeprom_params = &iwl6000_eeprom_params,		\

	.led_mode = IWL_LED_BLINK



const struct iwl_cfg iwl6000i_2agn_cfg = {

	.name = "Intel(R) Centrino(R) Advanced-N 6200 AGN",

	IWL_DEVICE_6000i,

	.ht_params = &iwl6000_ht_params,

};



const struct iwl_cfg iwl6000i_2abg_cfg = {

	.name = "Intel(R) Centrino(R) Advanced-N 6200 ABG",

const char iwl6000i_2agn_name[] = "Intel(R) Centrino(R) Advanced-N 6200 AGN";



const struct iwl_cfg iwl6000i_non_n_cfg = {

	IWL_DEVICE_6000i,

};



const struct iwl_cfg iwl6000i_2bg_cfg = {

	.name = "Intel(R) Centrino(R) Advanced-N 6200 BG",

	IWL_DEVICE_6000i,

const char iwl6000i_2abg_name[] = "Intel(R) Centrino(R) Advanced-N 6200 ABG";

const char iwl6000i_2bg_name[] = "Intel(R) Centrino(R) Advanced-N 6200 BG";



const struct iwl_cfg_trans_params iwl6050_trans_cfg = {

	.device_family = IWL_DEVICE_FAMILY_6050,

	.base_params = &iwl6050_base_params,

};



#define IWL_DEVICE_6050						\

	.fw_name_pre = IWL6050_FW_PRE,				\

	.ucode_api_max = IWL6050_UCODE_API_MAX,			\

	.ucode_api_min = IWL6050_UCODE_API_MIN,			\

	.trans.device_family = IWL_DEVICE_FAMILY_6050,		\

	.max_inst_size = IWL60_RTC_INST_SIZE,			\

	.max_data_size = IWL60_RTC_DATA_SIZE,			\

	.valid_tx_ant = ANT_AB,		/* .cfg overwrite */	\

	.valid_rx_ant = ANT_AB,		/* .cfg overwrite */	\

	.nvm_ver = EEPROM_6050_EEPROM_VERSION,		\

	.nvm_calib_ver = EEPROM_6050_TX_POWER_VERSION,	\

	.trans.base_params = &iwl6050_base_params,		\

	.eeprom_params = &iwl6000_eeprom_params,		\

	.led_mode = IWL_LED_BLINK,				\

	.internal_wimax_coex = true



const struct iwl_cfg iwl6050_2agn_cfg = {

	.name = "Intel(R) Centrino(R) Advanced-N + WiMAX 6250 AGN",

	IWL_DEVICE_6050,

	.ht_params = &iwl6000_ht_params,

};



const char iwl6050_2agn_name[] = "Intel(R) Centrino(R) Advanced-N + WiMAX 6250 AGN";



const struct iwl_cfg iwl6050_2abg_cfg = {

	.name = "Intel(R) Centrino(R) Advanced-N + WiMAX 6250 ABG",

	IWL_DEVICE_6050,

};



const char iwl6050_2abg_name[] = "Intel(R) Centrino(R) Advanced-N + WiMAX 6250 ABG";



const struct iwl_cfg_trans_params iwl6150_trans_cfg = {

	.device_family = IWL_DEVICE_FAMILY_6150,

	.base_params = &iwl6050_base_params,

};



#define IWL_DEVICE_6150						\

	.fw_name_pre = IWL6050_FW_PRE,				\

	.ucode_api_max = IWL6050_UCODE_API_MAX,			\

	.ucode_api_min = IWL6050_UCODE_API_MIN,			\

	.trans.device_family = IWL_DEVICE_FAMILY_6150,		\

	.max_inst_size = IWL60_RTC_INST_SIZE,			\

	.max_data_size = IWL60_RTC_DATA_SIZE,			\

	.nvm_ver = EEPROM_6150_EEPROM_VERSION,		\

	.nvm_calib_ver = EEPROM_6150_TX_POWER_VERSION,	\

	.trans.base_params = &iwl6050_base_params,		\

	.eeprom_params = &iwl6000_eeprom_params,		\

	.led_mode = IWL_LED_BLINK,				\

	.internal_wimax_coex = true



const struct iwl_cfg iwl6150_bgn_cfg = {

	.name = "Intel(R) Centrino(R) Wireless-N + WiMAX 6150 BGN",

	IWL_DEVICE_6150,

	.ht_params = &iwl6000_ht_params,

};



const char iwl6150_bgn_name[] = "Intel(R) Centrino(R) Wireless-N + WiMAX 6150 BGN";



const struct iwl_cfg iwl6150_bg_cfg = {

	.name = "Intel(R) Centrino(R) Wireless-N + WiMAX 6150 BG",

	IWL_DEVICE_6150,

};



const char iwl6150_bg_name[] = "Intel(R) Centrino(R) Wireless-N + WiMAX 6150 BG";



const struct iwl_cfg_trans_params iwl6000_trans_cfg = {

	.device_family = IWL_DEVICE_FAMILY_6000,

	.base_params = &iwl6000_base_params,

};



const struct iwl_cfg iwl6000_3agn_cfg = {

	.name = "Intel(R) Centrino(R) Ultimate-N 6300 AGN",

	.fw_name_pre = IWL6000_FW_PRE,

	.ucode_api_max = IWL6000_UCODE_API_MAX,

	.ucode_api_min = IWL6000_UCODE_API_MIN,

	.trans.device_family = IWL_DEVICE_FAMILY_6000,

	.max_inst_size = IWL60_RTC_INST_SIZE,

	.max_data_size = IWL60_RTC_DATA_SIZE,

	.nvm_ver = EEPROM_6000_EEPROM_VERSION,

	.nvm_calib_ver = EEPROM_6000_TX_POWER_VERSION,

	.trans.base_params = &iwl6000_base_params,

	.eeprom_params = &iwl6000_eeprom_params,

	.ht_params = &iwl6000_ht_params,

	.led_mode = IWL_LED_BLINK,

};



const char iwl6000_3agn_name[] = "Intel(R) Centrino(R) Ultimate-N 6300 AGN";



MODULE_FIRMWARE(IWL6000_MODULE_FIRMWARE(IWL6000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL6050_MODULE_FIRMWARE(IWL6050_UCODE_API_MAX));

MODULE_FIRMWARE(IWL6005_MODULE_FIRMWARE(IWL6000G2_UCODE_API_MAX));