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

Commit 498abba6 authored by Oren Givon's avatar Oren Givon Committed by Emmanuel Grumbach
Browse files

iwlwifi: add PCI IDs and add then new 3165 series 



This change does the following:
1) Add a new 7265 series PCI ID
2) Add two new 3160 series PCI IDs
3) Add the new 3165 series PCI IDs and configurations

Signed-off-by: default avatarOren Givon <oren.givon@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent f8dfc607

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

+16 −0
Original line number Original line Diff line number Diff line
@@ -83,6 +83,8 @@ 
#define IWL7260_TX_POWER_VERSION	0xffff /* meaningless */

#define IWL7260_TX_POWER_VERSION	0xffff /* meaningless */

#define IWL3160_NVM_VERSION		0x709

#define IWL3160_NVM_VERSION		0x709

#define IWL3160_TX_POWER_VERSION	0xffff /* meaningless */

#define IWL3160_TX_POWER_VERSION	0xffff /* meaningless */

#define IWL3165_NVM_VERSION		0x709

#define IWL3165_TX_POWER_VERSION	0xffff /* meaningless */

#define IWL7265_NVM_VERSION		0x0a1d

#define IWL7265_NVM_VERSION		0x0a1d

#define IWL7265_TX_POWER_VERSION	0xffff /* meaningless */

#define IWL7265_TX_POWER_VERSION	0xffff /* meaningless */
@@ -92,6 +94,9 @@ 
#define IWL3160_FW_PRE "iwlwifi-3160-"

#define IWL3160_FW_PRE "iwlwifi-3160-"

#define IWL3160_MODULE_FIRMWARE(api) IWL3160_FW_PRE __stringify(api) ".ucode"

#define IWL3160_MODULE_FIRMWARE(api) IWL3160_FW_PRE __stringify(api) ".ucode"





#define IWL3165_FW_PRE "iwlwifi-3165-"

#define IWL3165_MODULE_FIRMWARE(api) IWL3165_FW_PRE __stringify(api) ".ucode"



#define IWL7265_FW_PRE "iwlwifi-7265-"

#define IWL7265_FW_PRE "iwlwifi-7265-"

#define IWL7265_MODULE_FIRMWARE(api) IWL7265_FW_PRE __stringify(api) ".ucode"

#define IWL7265_MODULE_FIRMWARE(api) IWL7265_FW_PRE __stringify(api) ".ucode"
@@ -213,6 +218,16 @@ static const struct iwl_pwr_tx_backoff iwl7265_pwr_tx_backoffs[] = { 
	{0},

	{0},

};

};





const struct iwl_cfg iwl3165_2ac_cfg = {

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

	.fw_name_pre = IWL3165_FW_PRE,

	IWL_DEVICE_7000,

	.ht_params = &iwl7000_ht_params,

	.nvm_ver = IWL3165_NVM_VERSION,

	.nvm_calib_ver = IWL3165_TX_POWER_VERSION,

	.pwr_tx_backoffs = iwl7265_pwr_tx_backoffs,

};



const struct iwl_cfg iwl7265_2ac_cfg = {

const struct iwl_cfg iwl7265_2ac_cfg = {

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

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

	.fw_name_pre = IWL7265_FW_PRE,

	.fw_name_pre = IWL7265_FW_PRE,
@@ -245,4 +260,5 @@ const struct iwl_cfg iwl7265_n_cfg = { 




MODULE_FIRMWARE(IWL7260_MODULE_FIRMWARE(IWL7260_UCODE_API_OK));

MODULE_FIRMWARE(IWL7260_MODULE_FIRMWARE(IWL7260_UCODE_API_OK));

MODULE_FIRMWARE(IWL3160_MODULE_FIRMWARE(IWL3160_UCODE_API_OK));

MODULE_FIRMWARE(IWL3160_MODULE_FIRMWARE(IWL3160_UCODE_API_OK));

MODULE_FIRMWARE(IWL3165_MODULE_FIRMWARE(IWL3160_UCODE_API_OK));

MODULE_FIRMWARE(IWL7265_MODULE_FIRMWARE(IWL7260_UCODE_API_OK));
 
MODULE_FIRMWARE(IWL7265_MODULE_FIRMWARE(IWL7260_UCODE_API_OK));

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -337,6 +337,7 @@ extern const struct iwl_cfg iwl7260_n_cfg; 
extern const struct iwl_cfg iwl3160_2ac_cfg;

extern const struct iwl_cfg iwl3160_2ac_cfg;

extern const struct iwl_cfg iwl3160_2n_cfg;

extern const struct iwl_cfg iwl3160_2n_cfg;

extern const struct iwl_cfg iwl3160_n_cfg;

extern const struct iwl_cfg iwl3160_n_cfg;

extern const struct iwl_cfg iwl3165_2ac_cfg;

extern const struct iwl_cfg iwl7265_2ac_cfg;

extern const struct iwl_cfg iwl7265_2ac_cfg;

extern const struct iwl_cfg iwl7265_2n_cfg;

extern const struct iwl_cfg iwl7265_2n_cfg;

extern const struct iwl_cfg iwl7265_n_cfg;

extern const struct iwl_cfg iwl7265_n_cfg;

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

+7 −0
Original line number Original line Diff line number Diff line
@@ -352,11 +352,17 @@ static DEFINE_PCI_DEVICE_TABLE(iwl_hw_card_ids) = { 
	{IWL_PCI_DEVICE(0x08B3, 0x8060, iwl3160_2n_cfg)},

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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





/* 3165 Series */

	{IWL_PCI_DEVICE(0x3165, 0x4010, iwl3165_2ac_cfg)},

	{IWL_PCI_DEVICE(0x3165, 0x4210, iwl3165_2ac_cfg)},



/* 7265 Series */

/* 7265 Series */

	{IWL_PCI_DEVICE(0x095A, 0x5010, iwl7265_2ac_cfg)},

	{IWL_PCI_DEVICE(0x095A, 0x5010, iwl7265_2ac_cfg)},

	{IWL_PCI_DEVICE(0x095A, 0x5110, iwl7265_2ac_cfg)},

	{IWL_PCI_DEVICE(0x095A, 0x5110, iwl7265_2ac_cfg)},
@@ -378,6 +384,7 @@ static DEFINE_PCI_DEVICE_TABLE(iwl_hw_card_ids) = { 
	{IWL_PCI_DEVICE(0x095B, 0x5202, iwl7265_n_cfg)},

	{IWL_PCI_DEVICE(0x095B, 0x5202, iwl7265_n_cfg)},

	{IWL_PCI_DEVICE(0x095A, 0x9010, iwl7265_2ac_cfg)},

	{IWL_PCI_DEVICE(0x095A, 0x9010, iwl7265_2ac_cfg)},

	{IWL_PCI_DEVICE(0x095A, 0x9012, iwl7265_2ac_cfg)},

	{IWL_PCI_DEVICE(0x095A, 0x9012, iwl7265_2ac_cfg)},

	{IWL_PCI_DEVICE(0x095A, 0x900A, iwl7265_2ac_cfg)},

	{IWL_PCI_DEVICE(0x095A, 0x9110, iwl7265_2ac_cfg)},

	{IWL_PCI_DEVICE(0x095A, 0x9110, iwl7265_2ac_cfg)},

	{IWL_PCI_DEVICE(0x095A, 0x9112, iwl7265_2ac_cfg)},

	{IWL_PCI_DEVICE(0x095A, 0x9112, iwl7265_2ac_cfg)},

	{IWL_PCI_DEVICE(0x095A, 0x9210, iwl7265_2ac_cfg)},

	{IWL_PCI_DEVICE(0x095A, 0x9210, iwl7265_2ac_cfg)},