aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOren Givon <oren.givon@intel.com>2015-11-01 08:27:58 -0500
committerEmmanuel Grumbach <emmanuel.grumbach@intel.com>2015-12-01 14:17:54 -0500
commitabf10f868f70e8e7c62ac4bc61ff4ab94a09eda1 (patch)
tree6e0dd0ea4a95be1ec07a406367395e843e3afb8b
parentc4836b056d8316faf40ae94ac01557e6ee12c643 (diff)
iwlwifi: Add PCI IDs for the new series 8165
Add a new struct for the 8165 series and a few new PCI ID entries. Signed-off-by: Oren Givon <oren.givon@intel.com> Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
-rw-r--r--drivers/net/wireless/intel/iwlwifi/iwl-8000.c10
-rw-r--r--drivers/net/wireless/intel/iwlwifi/iwl-config.h1
-rw-r--r--drivers/net/wireless/intel/iwlwifi/pcie/drv.c2
3 files changed, 13 insertions, 0 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-8000.c b/drivers/net/wireless/intel/iwlwifi/iwl-8000.c
index dd22b7822bc5..89a25cffb060 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-8000.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-8000.c
@@ -186,6 +186,16 @@ const struct iwl_cfg iwl8260_2ac_cfg = {
186 .max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K, 186 .max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,
187}; 187};
188 188
189const struct iwl_cfg iwl8265_2ac_cfg = {
190 .name = "Intel(R) Dual Band Wireless AC 8265",
191 .fw_name_pre = IWL8000_FW_PRE,
192 IWL_DEVICE_8000,
193 .ht_params = &iwl8000_ht_params,
194 .nvm_ver = IWL8000_NVM_VERSION,
195 .nvm_calib_ver = IWL8000_TX_POWER_VERSION,
196 .max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,
197};
198
189const struct iwl_cfg iwl4165_2ac_cfg = { 199const struct iwl_cfg iwl4165_2ac_cfg = {
190 .name = "Intel(R) Dual Band Wireless AC 4165", 200 .name = "Intel(R) Dual Band Wireless AC 4165",
191 .fw_name_pre = IWL8000_FW_PRE, 201 .fw_name_pre = IWL8000_FW_PRE,
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-config.h b/drivers/net/wireless/intel/iwlwifi/iwl-config.h
index a1452a144805..6a4c0c236d10 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-config.h
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-config.h
@@ -429,6 +429,7 @@ extern const struct iwl_cfg iwl7265d_2n_cfg;
429extern const struct iwl_cfg iwl7265d_n_cfg; 429extern const struct iwl_cfg iwl7265d_n_cfg;
430extern const struct iwl_cfg iwl8260_2n_cfg; 430extern const struct iwl_cfg iwl8260_2n_cfg;
431extern const struct iwl_cfg iwl8260_2ac_cfg; 431extern const struct iwl_cfg iwl8260_2ac_cfg;
432extern const struct iwl_cfg iwl8265_2ac_cfg;
432extern const struct iwl_cfg iwl4165_2ac_cfg; 433extern const struct iwl_cfg iwl4165_2ac_cfg;
433extern const struct iwl_cfg iwl8260_2ac_sdio_cfg; 434extern const struct iwl_cfg iwl8260_2ac_sdio_cfg;
434extern const struct iwl_cfg iwl4165_2ac_sdio_cfg; 435extern const struct iwl_cfg iwl4165_2ac_sdio_cfg;
diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
index fe30c7862402..9bdce443628b 100644
--- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
@@ -471,6 +471,8 @@ static const struct pci_device_id iwl_hw_card_ids[] = {
471 {IWL_PCI_DEVICE(0x24F3, 0x0850, iwl8260_2ac_cfg)}, 471 {IWL_PCI_DEVICE(0x24F3, 0x0850, iwl8260_2ac_cfg)},
472 {IWL_PCI_DEVICE(0x24F3, 0x0950, iwl8260_2ac_cfg)}, 472 {IWL_PCI_DEVICE(0x24F3, 0x0950, iwl8260_2ac_cfg)},
473 {IWL_PCI_DEVICE(0x24F3, 0x0930, iwl8260_2ac_cfg)}, 473 {IWL_PCI_DEVICE(0x24F3, 0x0930, iwl8260_2ac_cfg)},
474 {IWL_PCI_DEVICE(0x24FD, 0x0000, iwl8265_2ac_cfg)},
475 {IWL_PCI_DEVICE(0x24FD, 0x0010, iwl8265_2ac_cfg)},
474 476
475/* 9000 Series */ 477/* 9000 Series */
476 {IWL_PCI_DEVICE(0x9DF0, 0x2A10, iwl5165_2ac_cfg)}, 478 {IWL_PCI_DEVICE(0x9DF0, 0x2A10, iwl5165_2ac_cfg)},