aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless
diff options
context:
space:
mode:
authorOren Givon <oren.givon@intel.com>2016-07-07 03:40:27 -0400
committerLuca Coelho <luciano.coelho@intel.com>2016-09-16 02:10:28 -0400
commit89e4ad53ae53e97a81c0bb1feeb40bc69d87d13c (patch)
tree25db8b2c68fbf8ed9b74fbdf2666fcdae9277765 /drivers/net/wireless
parent7c8d91eb312f30e96db04c710988394242a83565 (diff)
iwlwifi: add the new 9560 series
Add a new config struct for the new 9560 series and add the 4 new PCI IDs for it. Signed-off-by: Oren Givon <oren.givon@intel.com> Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r--drivers/net/wireless/intel/iwlwifi/iwl-9000.c11
-rw-r--r--drivers/net/wireless/intel/iwlwifi/iwl-config.h1
-rw-r--r--drivers/net/wireless/intel/iwlwifi/pcie/drv.c4
3 files changed, 16 insertions, 0 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-9000.c b/drivers/net/wireless/intel/iwlwifi/iwl-9000.c
index 1fec6afbe041..4d6898515046 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-9000.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-9000.c
@@ -187,6 +187,17 @@ const struct iwl_cfg iwl9460_2ac_cfg = {
187 .integrated = true, 187 .integrated = true,
188}; 188};
189 189
190const struct iwl_cfg iwl9560_2ac_cfg = {
191 .name = "Intel(R) Dual Band Wireless AC 9560",
192 .fw_name_pre = IWL9000_FW_PRE,
193 IWL_DEVICE_9000,
194 .ht_params = &iwl9000_ht_params,
195 .nvm_ver = IWL9000_NVM_VERSION,
196 .nvm_calib_ver = IWL9000_TX_POWER_VERSION,
197 .max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,
198 .integrated = true,
199};
200
190/* 201/*
191 * TODO the struct below is for internal testing only this should be 202 * TODO the struct below is for internal testing only this should be
192 * removed by EO 2016~ 203 * removed by EO 2016~
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-config.h b/drivers/net/wireless/intel/iwlwifi/iwl-config.h
index 7008319532ef..63d3f9b18bcb 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-config.h
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-config.h
@@ -454,6 +454,7 @@ extern const struct iwl_cfg iwl9160_2ac_cfg;
454extern const struct iwl_cfg iwl9260_2ac_cfg; 454extern const struct iwl_cfg iwl9260_2ac_cfg;
455extern const struct iwl_cfg iwl9270_2ac_cfg; 455extern const struct iwl_cfg iwl9270_2ac_cfg;
456extern const struct iwl_cfg iwl9460_2ac_cfg; 456extern const struct iwl_cfg iwl9460_2ac_cfg;
457extern const struct iwl_cfg iwl9560_2ac_cfg;
457extern const struct iwl_cfg iwla000_2ac_cfg; 458extern const struct iwl_cfg iwla000_2ac_cfg;
458#endif /* CONFIG_IWLMVM */ 459#endif /* CONFIG_IWLMVM */
459 460
diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
index c6e24fb286be..74aa416831bf 100644
--- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
@@ -523,6 +523,10 @@ static const struct pci_device_id iwl_hw_card_ids[] = {
523 {IWL_PCI_DEVICE(0x9DF0, 0x0060, iwl9460_2ac_cfg)}, 523 {IWL_PCI_DEVICE(0x9DF0, 0x0060, iwl9460_2ac_cfg)},
524 {IWL_PCI_DEVICE(0xA370, 0x0060, iwl9460_2ac_cfg)}, 524 {IWL_PCI_DEVICE(0xA370, 0x0060, iwl9460_2ac_cfg)},
525 {IWL_PCI_DEVICE(0x31DC, 0x0060, iwl9460_2ac_cfg)}, 525 {IWL_PCI_DEVICE(0x31DC, 0x0060, iwl9460_2ac_cfg)},
526 {IWL_PCI_DEVICE(0x2526, 0x0030, iwl9560_2ac_cfg)},
527 {IWL_PCI_DEVICE(0x9DF0, 0x0030, iwl9560_2ac_cfg)},
528 {IWL_PCI_DEVICE(0xA370, 0x0030, iwl9560_2ac_cfg)},
529 {IWL_PCI_DEVICE(0x31DC, 0x0030, iwl9560_2ac_cfg)},
526 530
527/* a000 Series */ 531/* a000 Series */
528 {IWL_PCI_DEVICE(0x2720, 0x0A10, iwla000_2ac_cfg)}, 532 {IWL_PCI_DEVICE(0x2720, 0x0A10, iwla000_2ac_cfg)},