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

Commit 93fc6411 authored by Oren Givon's avatar Oren Givon Committed by Johannes Berg
Browse files

iwlwifi: add new 7260 and 3160 series device IDs 



Add new device IDs and configurations to support
all the devices.

Signed-off-by: default avatarOren Givon <oren.givon@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 31d385ae

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

+39 −3
Original line number Diff line number Diff line
@@ -133,7 +133,25 @@ const struct iwl_cfg iwl7260_2ac_cfg = { 
	.nvm_calib_ver = IWL7260_TX_POWER_VERSION,

};



const struct iwl_cfg iwl3160_ac_cfg = {

const struct iwl_cfg iwl7260_2n_cfg = {

	.name = "Intel(R) Dual Band Wireless N 7260",

	.fw_name_pre = IWL7260_FW_PRE,

	IWL_DEVICE_7000,

	.ht_params = &iwl7000_ht_params,

	.nvm_ver = IWL7260_NVM_VERSION,

	.nvm_calib_ver = IWL7260_TX_POWER_VERSION,

};



const struct iwl_cfg iwl7260_n_cfg = {

	.name = "Intel(R) Wireless N 7260",

	.fw_name_pre = IWL7260_FW_PRE,

	IWL_DEVICE_7000,

	.ht_params = &iwl7000_ht_params,

	.nvm_ver = IWL7260_NVM_VERSION,

	.nvm_calib_ver = IWL7260_TX_POWER_VERSION,

};



const struct iwl_cfg iwl3160_2ac_cfg = {

	.name = "Intel(R) Dual Band Wireless AC 3160",

	.fw_name_pre = IWL3160_FW_PRE,

	IWL_DEVICE_7000,
@@ -142,5 +160,23 @@ const struct iwl_cfg iwl3160_ac_cfg = { 
	.nvm_calib_ver = IWL3160_TX_POWER_VERSION,

};



const struct iwl_cfg iwl3160_2n_cfg = {

	.name = "Intel(R) Dual Band Wireless N 3160",

	.fw_name_pre = IWL3160_FW_PRE,

	IWL_DEVICE_7000,

	.ht_params = &iwl7000_ht_params,

	.nvm_ver = IWL3160_NVM_VERSION,

	.nvm_calib_ver = IWL3160_TX_POWER_VERSION,

};



const struct iwl_cfg iwl3160_n_cfg = {

	.name = "Intel(R) Wireless N 3160",

	.fw_name_pre = IWL3160_FW_PRE,

	IWL_DEVICE_7000,

	.ht_params = &iwl7000_ht_params,

	.nvm_ver = IWL3160_NVM_VERSION,

	.nvm_calib_ver = IWL3160_TX_POWER_VERSION,

};



MODULE_FIRMWARE(IWL7260_MODULE_FIRMWARE(IWL7260_UCODE_API_OK));

MODULE_FIRMWARE(IWL3160_MODULE_FIRMWARE(IWL3160_UCODE_API_OK));

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

+5 −1
Original line number Diff line number Diff line
@@ -320,6 +320,10 @@ extern const struct iwl_cfg iwl105_bgn_cfg; 
extern const struct iwl_cfg iwl105_bgn_d_cfg;

extern const struct iwl_cfg iwl135_bgn_cfg;

extern const struct iwl_cfg iwl7260_2ac_cfg;

extern const struct iwl_cfg iwl3160_ac_cfg;

extern const struct iwl_cfg iwl7260_2n_cfg;

extern const struct iwl_cfg iwl7260_n_cfg;

extern const struct iwl_cfg iwl3160_2ac_cfg;

extern const struct iwl_cfg iwl3160_2n_cfg;

extern const struct iwl_cfg iwl3160_n_cfg;



#endif /* __IWL_CONFIG_H__ */

drivers/net/wireless/iwlwifi/pcie/drv.c

+47 −3
Original line number Diff line number Diff line
@@ -256,10 +256,54 @@ static DEFINE_PCI_DEVICE_TABLE(iwl_hw_card_ids) = { 


/* 7000 Series */

	{IWL_PCI_DEVICE(0x08B1, 0x4070, iwl7260_2ac_cfg)},

	{IWL_PCI_DEVICE(0x08B1, 0x4062, iwl7260_2ac_cfg)},

	{IWL_PCI_DEVICE(0x08B1, 0x4170, iwl7260_2ac_cfg)},

	{IWL_PCI_DEVICE(0x08B1, 0x4060, iwl7260_2n_cfg)},

	{IWL_PCI_DEVICE(0x08B1, 0x4160, iwl7260_2n_cfg)},

	{IWL_PCI_DEVICE(0x08B1, 0x4062, iwl7260_n_cfg)},

	{IWL_PCI_DEVICE(0x08B1, 0x4162, iwl7260_n_cfg)},

	{IWL_PCI_DEVICE(0x08B2, 0x4270, iwl7260_2ac_cfg)},

	{IWL_PCI_DEVICE(0x08B2, 0x4260, iwl7260_2n_cfg)},

	{IWL_PCI_DEVICE(0x08B2, 0x4262, iwl7260_n_cfg)},

	{IWL_PCI_DEVICE(0x08B1, 0x4470, iwl7260_2ac_cfg)},

	{IWL_PCI_DEVICE(0x08B1, 0x4460, iwl7260_2n_cfg)},

	{IWL_PCI_DEVICE(0x08B1, 0x4462, iwl7260_n_cfg)},

	{IWL_PCI_DEVICE(0x08B1, 0x4870, iwl7260_2ac_cfg)},

	{IWL_PCI_DEVICE(0x08B1, 0x486E, iwl7260_2ac_cfg)},

	{IWL_PCI_DEVICE(0x08B1, 0x4A70, iwl7260_2ac_cfg)},

	{IWL_PCI_DEVICE(0x08B1, 0x4A6E, iwl7260_2ac_cfg)},

	{IWL_PCI_DEVICE(0x08B1, 0x4A6C, iwl7260_2ac_cfg)},

	{IWL_PCI_DEVICE(0x08B1, 0x4020, iwl7260_2n_cfg)},

	{IWL_PCI_DEVICE(0x08B2, 0x4220, iwl7260_2n_cfg)},

	{IWL_PCI_DEVICE(0x08B1, 0x4420, iwl7260_2n_cfg)},

	{IWL_PCI_DEVICE(0x08B1, 0xC070, iwl7260_2ac_cfg)},

	{IWL_PCI_DEVICE(0x08B3, 0x0070, iwl3160_ac_cfg)},

	{IWL_PCI_DEVICE(0x08B3, 0x8070, iwl3160_ac_cfg)},

	{IWL_PCI_DEVICE(0x08B1, 0xC170, iwl7260_2ac_cfg)},

	{IWL_PCI_DEVICE(0x08B1, 0xC060, iwl7260_2n_cfg)},

	{IWL_PCI_DEVICE(0x08B1, 0xC160, iwl7260_2n_cfg)},

	{IWL_PCI_DEVICE(0x08B1, 0xC062, iwl7260_n_cfg)},

	{IWL_PCI_DEVICE(0x08B1, 0xC162, iwl7260_n_cfg)},

	{IWL_PCI_DEVICE(0x08B2, 0xC270, iwl7260_2ac_cfg)},

	{IWL_PCI_DEVICE(0x08B2, 0xC260, iwl7260_2n_cfg)},

	{IWL_PCI_DEVICE(0x08B2, 0xC262, iwl7260_n_cfg)},

	{IWL_PCI_DEVICE(0x08B1, 0xC470, iwl7260_2ac_cfg)},

	{IWL_PCI_DEVICE(0x08B1, 0xC460, iwl7260_2n_cfg)},

	{IWL_PCI_DEVICE(0x08B1, 0xC462, iwl7260_n_cfg)},

	{IWL_PCI_DEVICE(0x08B1, 0xC020, iwl7260_2n_cfg)},

	{IWL_PCI_DEVICE(0x08B2, 0xC220, iwl7260_2n_cfg)},

	{IWL_PCI_DEVICE(0x08B1, 0xC420, iwl7260_2n_cfg)},



/* 3160 Series */

	{IWL_PCI_DEVICE(0x08B3, 0x0070, iwl3160_2ac_cfg)},

	{IWL_PCI_DEVICE(0x08B3, 0x0170, iwl3160_2ac_cfg)},

	{IWL_PCI_DEVICE(0x08B3, 0x0060, iwl3160_2n_cfg)},

	{IWL_PCI_DEVICE(0x08B3, 0x0062, iwl3160_n_cfg)},

	{IWL_PCI_DEVICE(0x08B4, 0x0270, iwl3160_2ac_cfg)},

	{IWL_PCI_DEVICE(0x08B3, 0x0470, iwl3160_2ac_cfg)},

	{IWL_PCI_DEVICE(0x08B3, 0x8070, iwl3160_2ac_cfg)},

	{IWL_PCI_DEVICE(0x08B3, 0x8170, iwl3160_2ac_cfg)},

	{IWL_PCI_DEVICE(0x08B3, 0x8060, iwl3160_2n_cfg)},

	{IWL_PCI_DEVICE(0x08B3, 0x8062, iwl3160_n_cfg)},

	{IWL_PCI_DEVICE(0x08B4, 0x8270, iwl3160_2ac_cfg)},

	{IWL_PCI_DEVICE(0x08B3, 0x8470, iwl3160_2ac_cfg)},



	{0}

};