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

Commit 58a39090 authored by Wey-Yi Guy's avatar Wey-Yi Guy
Browse files

iwlagn: define 130 series of WiFi/BT combo devices 



add new structures and defines need to identify 130 devices.

Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
parent 898dade1

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

+44 −0
Original line number Original line Diff line number Diff line
@@ -53,11 +53,13 @@ 
#define IWL6000_UCODE_API_MAX 4

#define IWL6000_UCODE_API_MAX 4

#define IWL6050_UCODE_API_MAX 5

#define IWL6050_UCODE_API_MAX 5

#define IWL6000G2_UCODE_API_MAX 5

#define IWL6000G2_UCODE_API_MAX 5

#define IWL130_UCODE_API_MAX 5





/* Lowest firmware API version supported */

/* Lowest firmware API version supported */

#define IWL6000_UCODE_API_MIN 4

#define IWL6000_UCODE_API_MIN 4

#define IWL6050_UCODE_API_MIN 4

#define IWL6050_UCODE_API_MIN 4

#define IWL6000G2_UCODE_API_MIN 4

#define IWL6000G2_UCODE_API_MIN 4

#define IWL130_UCODE_API_MIN 5





#define IWL6000_FW_PRE "iwlwifi-6000-"

#define IWL6000_FW_PRE "iwlwifi-6000-"

#define _IWL6000_MODULE_FIRMWARE(api) IWL6000_FW_PRE #api ".ucode"

#define _IWL6000_MODULE_FIRMWARE(api) IWL6000_FW_PRE #api ".ucode"
@@ -75,6 +77,9 @@ 
#define _IWL6000G2B_MODULE_FIRMWARE(api) IWL6000G2B_FW_PRE #api ".ucode"

#define _IWL6000G2B_MODULE_FIRMWARE(api) IWL6000G2B_FW_PRE #api ".ucode"

#define IWL6000G2B_MODULE_FIRMWARE(api) _IWL6000G2B_MODULE_FIRMWARE(api)

#define IWL6000G2B_MODULE_FIRMWARE(api) _IWL6000G2B_MODULE_FIRMWARE(api)





#define IWL130_FW_PRE "iwlwifi-130-"

#define _IWL100_MODULE_FIRMWARE(api) IWL130_FW_PRE #api ".ucode"

#define IWL100_MODULE_FIRMWARE(api) _IWL130_MODULE_FIRMWARE(api)





static void iwl6000_set_ct_threshold(struct iwl_priv *priv)

static void iwl6000_set_ct_threshold(struct iwl_priv *priv)

{

{
@@ -810,6 +815,45 @@ struct iwl_cfg iwl6000_3agn_cfg = { 
	.need_dc_calib = true,

	.need_dc_calib = true,

};

};





struct iwl_cfg iwl130_bgn_cfg = {

	.name = "Intel(R) 130 Series 1x1 BGN",

	.fw_name_pre = IWL6000G2B_FW_PRE,

	.ucode_api_max = IWL130_UCODE_API_MAX,

	.ucode_api_min = IWL130_UCODE_API_MIN,

	.sku = IWL_SKU_G|IWL_SKU_N,

	.valid_tx_ant = ANT_A,

	.valid_rx_ant = ANT_A,

	.eeprom_ver = EEPROM_6000G2_EEPROM_VERSION,

	.eeprom_calib_ver = EEPROM_6000G2_TX_POWER_VERSION,

	.ops = &iwl6000g2b_ops,

	.mod_params = &iwlagn_mod_params,

	.base_params = &iwl6000_base_params,

	.bt_params = &iwl6000_bt_params,

	.ht_params = &iwl6000_ht_params,

	.need_dc_calib = true,

	/* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */

	.scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A,

};



struct iwl_cfg iwl130_bg_cfg = {

	.name = "Intel(R) 130 Series 1x2 BG",

	.fw_name_pre = IWL6000G2B_FW_PRE,

	.ucode_api_max = IWL130_UCODE_API_MAX,

	.ucode_api_min = IWL130_UCODE_API_MIN,

	.sku = IWL_SKU_G,

	.valid_tx_ant = ANT_A,

	.valid_rx_ant = ANT_A,

	.eeprom_ver = EEPROM_6000G2_EEPROM_VERSION,

	.eeprom_calib_ver = EEPROM_6000G2_TX_POWER_VERSION,

	.ops = &iwl6000g2b_ops,

	.mod_params = &iwlagn_mod_params,

	.base_params = &iwl6000_base_params,

	.bt_params = &iwl6000_bt_params,

	.need_dc_calib = true,

	/* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */

	.scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A,

};



MODULE_FIRMWARE(IWL6000_MODULE_FIRMWARE(IWL6000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL6000_MODULE_FIRMWARE(IWL6000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL6050_MODULE_FIRMWARE(IWL6050_UCODE_API_MAX));

MODULE_FIRMWARE(IWL6050_MODULE_FIRMWARE(IWL6050_UCODE_API_MAX));

MODULE_FIRMWARE(IWL6000G2A_MODULE_FIRMWARE(IWL6000G2_UCODE_API_MAX));

MODULE_FIRMWARE(IWL6000G2A_MODULE_FIRMWARE(IWL6000G2_UCODE_API_MAX));

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

+10 −0
Original line number Original line Diff line number Diff line
@@ -4822,11 +4822,21 @@ static DEFINE_PCI_DEVICE_TABLE(iwl_hw_card_ids) = { 
	{IWL_PCI_DEVICE(0x0084, 0x1216, iwl1000_bg_cfg)},

	{IWL_PCI_DEVICE(0x0084, 0x1216, iwl1000_bg_cfg)},

	{IWL_PCI_DEVICE(0x0084, 0x1316, iwl1000_bg_cfg)},

	{IWL_PCI_DEVICE(0x0084, 0x1316, iwl1000_bg_cfg)},





/* 100 Series WiFi */

	{IWL_PCI_DEVICE(0x08AE, 0x1005, iwl100_bgn_cfg)},

	{IWL_PCI_DEVICE(0x08AE, 0x1005, iwl100_bgn_cfg)},

	{IWL_PCI_DEVICE(0x08AF, 0x1015, iwl100_bgn_cfg)},

	{IWL_PCI_DEVICE(0x08AF, 0x1015, iwl100_bgn_cfg)},

	{IWL_PCI_DEVICE(0x08AE, 0x1025, iwl100_bgn_cfg)},

	{IWL_PCI_DEVICE(0x08AE, 0x1025, iwl100_bgn_cfg)},

	{IWL_PCI_DEVICE(0x08AE, 0x1007, iwl100_bg_cfg)},

	{IWL_PCI_DEVICE(0x08AE, 0x1007, iwl100_bg_cfg)},

	{IWL_PCI_DEVICE(0x08AE, 0x1017, iwl100_bg_cfg)},

	{IWL_PCI_DEVICE(0x08AE, 0x1017, iwl100_bg_cfg)},



/* 130 Series WiFi */

	{IWL_PCI_DEVICE(0x0896, 0x5005, iwl130_bgn_cfg)},

	{IWL_PCI_DEVICE(0x0896, 0x5007, iwl130_bg_cfg)},

	{IWL_PCI_DEVICE(0x0897, 0x5015, iwl130_bgn_cfg)},

	{IWL_PCI_DEVICE(0x0897, 0x5017, iwl130_bg_cfg)},

	{IWL_PCI_DEVICE(0x0896, 0x5025, iwl130_bgn_cfg)},

	{IWL_PCI_DEVICE(0x0896, 0x5027, iwl130_bg_cfg)},



#endif /* CONFIG_IWL5000 */

#endif /* CONFIG_IWL5000 */





	{0}

	{0}

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

+2 −0
Original line number Original line Diff line number Diff line
@@ -94,6 +94,8 @@ extern struct iwl_cfg iwl1000_bgn_cfg; 
extern struct iwl_cfg iwl1000_bg_cfg;

extern struct iwl_cfg iwl1000_bg_cfg;

extern struct iwl_cfg iwl100_bgn_cfg;

extern struct iwl_cfg iwl100_bgn_cfg;

extern struct iwl_cfg iwl100_bg_cfg;

extern struct iwl_cfg iwl100_bg_cfg;

extern struct iwl_cfg iwl130_bgn_cfg;

extern struct iwl_cfg iwl130_bg_cfg;





extern struct iwl_mod_params iwlagn_mod_params;

extern struct iwl_mod_params iwlagn_mod_params;

extern struct iwl_hcmd_ops iwlagn_hcmd;

extern struct iwl_hcmd_ops iwlagn_hcmd;