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

Commit c4aee085 authored by Eran Harary's avatar Eran Harary Committed by Johannes Berg
Browse files

iwlwifi: Support 7265 devices 



7265 is a very similar device to 7260, so just add
the definitions based on 7260 for it.

Signed-off-by: default avatarEran Harary <eran.harary@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent ffa6c707

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

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

#define IWL3160_NVM_VERSION		0x709

#define IWL3160_TX_POWER_VERSION	0xffff /* meaningless */

#define IWL7265_NVM_VERSION		0x0a1d

#define IWL7265_TX_POWER_VERSION	0xffff /* meaningless */



#define IWL7260_FW_PRE "iwlwifi-7260-"

#define IWL7260_MODULE_FIRMWARE(api) IWL7260_FW_PRE __stringify(api) ".ucode"
@@ -90,6 +92,9 @@ 
#define IWL3160_FW_PRE "iwlwifi-3160-"

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



#define IWL7265_FW_PRE "iwlwifi-7265-"

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



static const struct iwl_base_params iwl7000_base_params = {

	.eeprom_size = OTP_LOW_IMAGE_SIZE,

	.num_of_queues = IWLAGN_NUM_QUEUES,
@@ -182,5 +187,14 @@ const struct iwl_cfg iwl3160_n_cfg = { 
	.nvm_calib_ver = IWL3160_TX_POWER_VERSION,

};



const struct iwl_cfg iwl7265_2ac_cfg = {

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

	.fw_name_pre = IWL7265_FW_PRE,

	IWL_DEVICE_7000,

	.ht_params = &iwl7000_ht_params,

	.nvm_ver = IWL7265_NVM_VERSION,

	.nvm_calib_ver = IWL7265_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

+1 −0
Original line number Diff line number Diff line
@@ -292,6 +292,7 @@ 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;

extern const struct iwl_cfg iwl7265_2ac_cfg;

#endif /* CONFIG_IWLMVM */



#endif /* __IWL_CONFIG_H__ */

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

+4 −1
Original line number Diff line number Diff line
@@ -258,7 +258,7 @@ static DEFINE_PCI_DEVICE_TABLE(iwl_hw_card_ids) = { 
#endif /* CONFIG_IWLDVM */



#if IS_ENABLED(CONFIG_IWLMVM)

/* 7000 Series */

/* 7260 Series */

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

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

	{IWL_PCI_DEVICE(0x08B1, 0x4060, iwl7260_2n_cfg)},
@@ -308,6 +308,9 @@ static DEFINE_PCI_DEVICE_TABLE(iwl_hw_card_ids) = { 
	{IWL_PCI_DEVICE(0x08B3, 0x8062, iwl3160_n_cfg)},

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

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



/* 7265 Series */

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

#endif /* CONFIG_IWLMVM */



	{0}