aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorEran Harary <eran.harary@intel.com>2013-10-08 02:03:07 -0400
committerJohannes Berg <johannes.berg@intel.com>2013-10-11 04:01:28 -0400
commitc4aee085c0c0079cdb45f68bf63cb930a1932783 (patch)
tree267dd60d84607e1cae9aa0e9de84916aa99dd983 /drivers
parentffa6c7077c3f7a433312b733688b9b14f38de17e (diff)
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: Eran Harary <eran.harary@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-7000.c14
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-config.h1
-rw-r--r--drivers/net/wireless/iwlwifi/pcie/drv.c5
3 files changed, 19 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-7000.c b/drivers/net/wireless/iwlwifi/iwl-7000.c
index 76e14c046d94..85879dbaa402 100644
--- a/drivers/net/wireless/iwlwifi/iwl-7000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-7000.c
@@ -83,6 +83,8 @@
83#define IWL7260_TX_POWER_VERSION 0xffff /* meaningless */ 83#define IWL7260_TX_POWER_VERSION 0xffff /* meaningless */
84#define IWL3160_NVM_VERSION 0x709 84#define IWL3160_NVM_VERSION 0x709
85#define IWL3160_TX_POWER_VERSION 0xffff /* meaningless */ 85#define IWL3160_TX_POWER_VERSION 0xffff /* meaningless */
86#define IWL7265_NVM_VERSION 0x0a1d
87#define IWL7265_TX_POWER_VERSION 0xffff /* meaningless */
86 88
87#define IWL7260_FW_PRE "iwlwifi-7260-" 89#define IWL7260_FW_PRE "iwlwifi-7260-"
88#define IWL7260_MODULE_FIRMWARE(api) IWL7260_FW_PRE __stringify(api) ".ucode" 90#define IWL7260_MODULE_FIRMWARE(api) IWL7260_FW_PRE __stringify(api) ".ucode"
@@ -90,6 +92,9 @@
90#define IWL3160_FW_PRE "iwlwifi-3160-" 92#define IWL3160_FW_PRE "iwlwifi-3160-"
91#define IWL3160_MODULE_FIRMWARE(api) IWL3160_FW_PRE __stringify(api) ".ucode" 93#define IWL3160_MODULE_FIRMWARE(api) IWL3160_FW_PRE __stringify(api) ".ucode"
92 94
95#define IWL7265_FW_PRE "iwlwifi-7265-"
96#define IWL7265_MODULE_FIRMWARE(api) IWL7265_FW_PRE __stringify(api) ".ucode"
97
93static const struct iwl_base_params iwl7000_base_params = { 98static const struct iwl_base_params iwl7000_base_params = {
94 .eeprom_size = OTP_LOW_IMAGE_SIZE, 99 .eeprom_size = OTP_LOW_IMAGE_SIZE,
95 .num_of_queues = IWLAGN_NUM_QUEUES, 100 .num_of_queues = IWLAGN_NUM_QUEUES,
@@ -182,5 +187,14 @@ const struct iwl_cfg iwl3160_n_cfg = {
182 .nvm_calib_ver = IWL3160_TX_POWER_VERSION, 187 .nvm_calib_ver = IWL3160_TX_POWER_VERSION,
183}; 188};
184 189
190const struct iwl_cfg iwl7265_2ac_cfg = {
191 .name = "Intel(R) Dual Band Wireless AC 7265",
192 .fw_name_pre = IWL7265_FW_PRE,
193 IWL_DEVICE_7000,
194 .ht_params = &iwl7000_ht_params,
195 .nvm_ver = IWL7265_NVM_VERSION,
196 .nvm_calib_ver = IWL7265_TX_POWER_VERSION,
197};
198
185MODULE_FIRMWARE(IWL7260_MODULE_FIRMWARE(IWL7260_UCODE_API_OK)); 199MODULE_FIRMWARE(IWL7260_MODULE_FIRMWARE(IWL7260_UCODE_API_OK));
186MODULE_FIRMWARE(IWL3160_MODULE_FIRMWARE(IWL3160_UCODE_API_OK)); 200MODULE_FIRMWARE(IWL3160_MODULE_FIRMWARE(IWL3160_UCODE_API_OK));
diff --git a/drivers/net/wireless/iwlwifi/iwl-config.h b/drivers/net/wireless/iwlwifi/iwl-config.h
index e4d370bff306..261e4a12fd8e 100644
--- a/drivers/net/wireless/iwlwifi/iwl-config.h
+++ b/drivers/net/wireless/iwlwifi/iwl-config.h
@@ -292,6 +292,7 @@ extern const struct iwl_cfg iwl7260_n_cfg;
292extern const struct iwl_cfg iwl3160_2ac_cfg; 292extern const struct iwl_cfg iwl3160_2ac_cfg;
293extern const struct iwl_cfg iwl3160_2n_cfg; 293extern const struct iwl_cfg iwl3160_2n_cfg;
294extern const struct iwl_cfg iwl3160_n_cfg; 294extern const struct iwl_cfg iwl3160_n_cfg;
295extern const struct iwl_cfg iwl7265_2ac_cfg;
295#endif /* CONFIG_IWLMVM */ 296#endif /* CONFIG_IWLMVM */
296 297
297#endif /* __IWL_CONFIG_H__ */ 298#endif /* __IWL_CONFIG_H__ */
diff --git a/drivers/net/wireless/iwlwifi/pcie/drv.c b/drivers/net/wireless/iwlwifi/pcie/drv.c
index 5c5c423aa286..ddf15e1cffa2 100644
--- a/drivers/net/wireless/iwlwifi/pcie/drv.c
+++ b/drivers/net/wireless/iwlwifi/pcie/drv.c
@@ -258,7 +258,7 @@ static DEFINE_PCI_DEVICE_TABLE(iwl_hw_card_ids) = {
258#endif /* CONFIG_IWLDVM */ 258#endif /* CONFIG_IWLDVM */
259 259
260#if IS_ENABLED(CONFIG_IWLMVM) 260#if IS_ENABLED(CONFIG_IWLMVM)
261/* 7000 Series */ 261/* 7260 Series */
262 {IWL_PCI_DEVICE(0x08B1, 0x4070, iwl7260_2ac_cfg)}, 262 {IWL_PCI_DEVICE(0x08B1, 0x4070, iwl7260_2ac_cfg)},
263 {IWL_PCI_DEVICE(0x08B1, 0x4170, iwl7260_2ac_cfg)}, 263 {IWL_PCI_DEVICE(0x08B1, 0x4170, iwl7260_2ac_cfg)},
264 {IWL_PCI_DEVICE(0x08B1, 0x4060, iwl7260_2n_cfg)}, 264 {IWL_PCI_DEVICE(0x08B1, 0x4060, iwl7260_2n_cfg)},
@@ -308,6 +308,9 @@ static DEFINE_PCI_DEVICE_TABLE(iwl_hw_card_ids) = {
308 {IWL_PCI_DEVICE(0x08B3, 0x8062, iwl3160_n_cfg)}, 308 {IWL_PCI_DEVICE(0x08B3, 0x8062, iwl3160_n_cfg)},
309 {IWL_PCI_DEVICE(0x08B4, 0x8270, iwl3160_2ac_cfg)}, 309 {IWL_PCI_DEVICE(0x08B4, 0x8270, iwl3160_2ac_cfg)},
310 {IWL_PCI_DEVICE(0x08B3, 0x8470, iwl3160_2ac_cfg)}, 310 {IWL_PCI_DEVICE(0x08B3, 0x8470, iwl3160_2ac_cfg)},
311
312/* 7265 Series */
313 {IWL_PCI_DEVICE(0x095A, 0x5010, iwl7265_2ac_cfg)},
311#endif /* CONFIG_IWLMVM */ 314#endif /* CONFIG_IWLMVM */
312 315
313 {0} 316 {0}