aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuca Coelho <luciano.coelho@intel.com>2017-11-15 11:28:04 -0500
committerLuca Coelho <luciano.coelho@intel.com>2017-11-16 03:38:13 -0500
commitdbc89253a7e15f8f031fb1eeb956de91204655e3 (patch)
tree66c283fa20dccd8c517c18c1ecf5d3833e8e2476
parentdac4df1c5f2c34903f61b1bc4fc722e31b4199e7 (diff)
iwlwifi: fix PCI IDs and configuration mapping for 9000 series
A lot of PCI IDs were missing and there were some problems with the configuration and firmware selection for devices on the 9000 series. Fix the firmware selection by adding files for the B-steps; add configuration for some integrated devices; and add a bunch of PCI IDs (mostly for integrated devices) that were missing from the driver's list. Without this patch, a lot of devices will not be recognized or will try to load the wrong firmware file. Cc: stable@vger.kernel.org # 4.13 Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
-rw-r--r--drivers/net/wireless/intel/iwlwifi/cfg/9000.c67
-rw-r--r--drivers/net/wireless/intel/iwlwifi/iwl-config.h5
-rw-r--r--drivers/net/wireless/intel/iwlwifi/pcie/drv.c132
3 files changed, 170 insertions, 34 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/9000.c b/drivers/net/wireless/intel/iwlwifi/cfg/9000.c
index af7c4f36b66f..b6990400042f 100644
--- a/drivers/net/wireless/intel/iwlwifi/cfg/9000.c
+++ b/drivers/net/wireless/intel/iwlwifi/cfg/9000.c
@@ -72,12 +72,15 @@
72#define IWL9000_SMEM_OFFSET 0x400000 72#define IWL9000_SMEM_OFFSET 0x400000
73#define IWL9000_SMEM_LEN 0x68000 73#define IWL9000_SMEM_LEN 0x68000
74 74
75#define IWL9000_FW_PRE "iwlwifi-9000-pu-a0-jf-a0-" 75#define IWL9000A_FW_PRE "iwlwifi-9000-pu-a0-jf-a0-"
76#define IWL9000B_FW_PRE "iwlwifi-9000-pu-b0-jf-b0-"
76#define IWL9000RFB_FW_PRE "iwlwifi-9000-pu-a0-jf-b0-" 77#define IWL9000RFB_FW_PRE "iwlwifi-9000-pu-a0-jf-b0-"
77#define IWL9260A_FW_PRE "iwlwifi-9260-th-a0-jf-a0-" 78#define IWL9260A_FW_PRE "iwlwifi-9260-th-a0-jf-a0-"
78#define IWL9260B_FW_PRE "iwlwifi-9260-th-b0-jf-b0-" 79#define IWL9260B_FW_PRE "iwlwifi-9260-th-b0-jf-b0-"
79#define IWL9000_MODULE_FIRMWARE(api) \ 80#define IWL9000A_MODULE_FIRMWARE(api) \
80 IWL9000_FW_PRE "-" __stringify(api) ".ucode" 81 IWL9000A_FW_PRE __stringify(api) ".ucode"
82#define IWL9000B_MODULE_FIRMWARE(api) \
83 IWL9000B_FW_PRE __stringify(api) ".ucode"
81#define IWL9000RFB_MODULE_FIRMWARE(api) \ 84#define IWL9000RFB_MODULE_FIRMWARE(api) \
82 IWL9000RFB_FW_PRE "-" __stringify(api) ".ucode" 85 IWL9000RFB_FW_PRE "-" __stringify(api) ".ucode"
83#define IWL9260A_MODULE_FIRMWARE(api) \ 86#define IWL9260A_MODULE_FIRMWARE(api) \
@@ -194,7 +197,48 @@ const struct iwl_cfg iwl9460_2ac_cfg = {
194 .nvm_ver = IWL9000_NVM_VERSION, 197 .nvm_ver = IWL9000_NVM_VERSION,
195 .nvm_calib_ver = IWL9000_TX_POWER_VERSION, 198 .nvm_calib_ver = IWL9000_TX_POWER_VERSION,
196 .max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K, 199 .max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,
200};
201
202const struct iwl_cfg iwl9460_2ac_cfg_soc = {
203 .name = "Intel(R) Dual Band Wireless AC 9460",
204 .fw_name_pre = IWL9000A_FW_PRE,
205 .fw_name_pre_b_or_c_step = IWL9000B_FW_PRE,
206 .fw_name_pre_rf_next_step = IWL9000RFB_FW_PRE,
207 IWL_DEVICE_9000,
208 .ht_params = &iwl9000_ht_params,
209 .nvm_ver = IWL9000_NVM_VERSION,
210 .nvm_calib_ver = IWL9000_TX_POWER_VERSION,
211 .max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,
197 .integrated = true, 212 .integrated = true,
213 .soc_latency = 5000,
214};
215
216const struct iwl_cfg iwl9461_2ac_cfg_soc = {
217 .name = "Intel(R) Dual Band Wireless AC 9461",
218 .fw_name_pre = IWL9000A_FW_PRE,
219 .fw_name_pre_b_or_c_step = IWL9000B_FW_PRE,
220 .fw_name_pre_rf_next_step = IWL9000RFB_FW_PRE,
221 IWL_DEVICE_9000,
222 .ht_params = &iwl9000_ht_params,
223 .nvm_ver = IWL9000_NVM_VERSION,
224 .nvm_calib_ver = IWL9000_TX_POWER_VERSION,
225 .max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,
226 .integrated = true,
227 .soc_latency = 5000,
228};
229
230const struct iwl_cfg iwl9462_2ac_cfg_soc = {
231 .name = "Intel(R) Dual Band Wireless AC 9462",
232 .fw_name_pre = IWL9000A_FW_PRE,
233 .fw_name_pre_b_or_c_step = IWL9000B_FW_PRE,
234 .fw_name_pre_rf_next_step = IWL9000RFB_FW_PRE,
235 IWL_DEVICE_9000,
236 .ht_params = &iwl9000_ht_params,
237 .nvm_ver = IWL9000_NVM_VERSION,
238 .nvm_calib_ver = IWL9000_TX_POWER_VERSION,
239 .max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,
240 .integrated = true,
241 .soc_latency = 5000,
198}; 242};
199 243
200const struct iwl_cfg iwl9560_2ac_cfg = { 244const struct iwl_cfg iwl9560_2ac_cfg = {
@@ -206,10 +250,23 @@ const struct iwl_cfg iwl9560_2ac_cfg = {
206 .nvm_ver = IWL9000_NVM_VERSION, 250 .nvm_ver = IWL9000_NVM_VERSION,
207 .nvm_calib_ver = IWL9000_TX_POWER_VERSION, 251 .nvm_calib_ver = IWL9000_TX_POWER_VERSION,
208 .max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K, 252 .max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,
209 .integrated = true,
210}; 253};
211 254
212MODULE_FIRMWARE(IWL9000_MODULE_FIRMWARE(IWL9000_UCODE_API_MAX)); 255const struct iwl_cfg iwl9560_2ac_cfg_soc = {
256 .name = "Intel(R) Dual Band Wireless AC 9560",
257 .fw_name_pre = IWL9000A_FW_PRE,
258 .fw_name_pre_b_or_c_step = IWL9000B_FW_PRE,
259 .fw_name_pre_rf_next_step = IWL9000RFB_FW_PRE,
260 IWL_DEVICE_9000,
261 .ht_params = &iwl9000_ht_params,
262 .nvm_ver = IWL9000_NVM_VERSION,
263 .nvm_calib_ver = IWL9000_TX_POWER_VERSION,
264 .max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,
265 .integrated = true,
266 .soc_latency = 5000,
267};
268MODULE_FIRMWARE(IWL9000A_MODULE_FIRMWARE(IWL9000_UCODE_API_MAX));
269MODULE_FIRMWARE(IWL9000B_MODULE_FIRMWARE(IWL9000_UCODE_API_MAX));
213MODULE_FIRMWARE(IWL9000RFB_MODULE_FIRMWARE(IWL9000_UCODE_API_MAX)); 270MODULE_FIRMWARE(IWL9000RFB_MODULE_FIRMWARE(IWL9000_UCODE_API_MAX));
214MODULE_FIRMWARE(IWL9260A_MODULE_FIRMWARE(IWL9000_UCODE_API_MAX)); 271MODULE_FIRMWARE(IWL9260A_MODULE_FIRMWARE(IWL9000_UCODE_API_MAX));
215MODULE_FIRMWARE(IWL9260B_MODULE_FIRMWARE(IWL9000_UCODE_API_MAX)); 272MODULE_FIRMWARE(IWL9260B_MODULE_FIRMWARE(IWL9000_UCODE_API_MAX));
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-config.h b/drivers/net/wireless/intel/iwlwifi/iwl-config.h
index d1263a554420..e21e46cf6f9a 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-config.h
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-config.h
@@ -366,6 +366,7 @@ struct iwl_cfg {
366 u32 dccm2_len; 366 u32 dccm2_len;
367 u32 smem_offset; 367 u32 smem_offset;
368 u32 smem_len; 368 u32 smem_len;
369 u32 soc_latency;
369 u16 nvm_ver; 370 u16 nvm_ver;
370 u16 nvm_calib_ver; 371 u16 nvm_calib_ver;
371 u16 rx_with_siso_diversity:1, 372 u16 rx_with_siso_diversity:1,
@@ -472,6 +473,10 @@ extern const struct iwl_cfg iwl9260_2ac_cfg;
472extern const struct iwl_cfg iwl9270_2ac_cfg; 473extern const struct iwl_cfg iwl9270_2ac_cfg;
473extern const struct iwl_cfg iwl9460_2ac_cfg; 474extern const struct iwl_cfg iwl9460_2ac_cfg;
474extern const struct iwl_cfg iwl9560_2ac_cfg; 475extern const struct iwl_cfg iwl9560_2ac_cfg;
476extern const struct iwl_cfg iwl9460_2ac_cfg_soc;
477extern const struct iwl_cfg iwl9461_2ac_cfg_soc;
478extern const struct iwl_cfg iwl9462_2ac_cfg_soc;
479extern const struct iwl_cfg iwl9560_2ac_cfg_soc;
475extern const struct iwl_cfg iwla000_2ac_cfg_hr; 480extern const struct iwl_cfg iwla000_2ac_cfg_hr;
476extern const struct iwl_cfg iwla000_2ac_cfg_hr_cdb; 481extern const struct iwl_cfg iwla000_2ac_cfg_hr_cdb;
477extern const struct iwl_cfg iwla000_2ac_cfg_jf; 482extern const struct iwl_cfg iwla000_2ac_cfg_jf;
diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
index 4a21c12276d7..f21fe59faccf 100644
--- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
@@ -535,47 +535,121 @@ static const struct pci_device_id iwl_hw_card_ids[] = {
535 {IWL_PCI_DEVICE(0x2526, 0x0238, iwl9560_2ac_cfg)}, 535 {IWL_PCI_DEVICE(0x2526, 0x0238, iwl9560_2ac_cfg)},
536 {IWL_PCI_DEVICE(0x2526, 0x023C, iwl9560_2ac_cfg)}, 536 {IWL_PCI_DEVICE(0x2526, 0x023C, iwl9560_2ac_cfg)},
537 {IWL_PCI_DEVICE(0x2526, 0x0260, iwl9460_2ac_cfg)}, 537 {IWL_PCI_DEVICE(0x2526, 0x0260, iwl9460_2ac_cfg)},
538 {IWL_PCI_DEVICE(0x2526, 0x0264, iwl9461_2ac_cfg_soc)},
538 {IWL_PCI_DEVICE(0x2526, 0x02A0, iwl9460_2ac_cfg)}, 539 {IWL_PCI_DEVICE(0x2526, 0x02A0, iwl9460_2ac_cfg)},
539 {IWL_PCI_DEVICE(0x2526, 0x02A4, iwl9460_2ac_cfg)}, 540 {IWL_PCI_DEVICE(0x2526, 0x02A4, iwl9460_2ac_cfg)},
541 {IWL_PCI_DEVICE(0x2526, 0x1010, iwl9260_2ac_cfg)},
540 {IWL_PCI_DEVICE(0x2526, 0x1030, iwl9560_2ac_cfg)}, 542 {IWL_PCI_DEVICE(0x2526, 0x1030, iwl9560_2ac_cfg)},
543 {IWL_PCI_DEVICE(0x2526, 0x1210, iwl9260_2ac_cfg)},
541 {IWL_PCI_DEVICE(0x2526, 0x1410, iwl9270_2ac_cfg)}, 544 {IWL_PCI_DEVICE(0x2526, 0x1410, iwl9270_2ac_cfg)},
542 {IWL_PCI_DEVICE(0x2526, 0x1420, iwl9460_2ac_cfg)}, 545 {IWL_PCI_DEVICE(0x2526, 0x1420, iwl9460_2ac_cfg_soc)},
543 {IWL_PCI_DEVICE(0x2526, 0x1610, iwl9270_2ac_cfg)}, 546 {IWL_PCI_DEVICE(0x2526, 0x1610, iwl9270_2ac_cfg)},
544 {IWL_PCI_DEVICE(0x2526, 0x4010, iwl9260_2ac_cfg)}, 547 {IWL_PCI_DEVICE(0x2526, 0x4010, iwl9260_2ac_cfg)},
545 {IWL_PCI_DEVICE(0x2526, 0x4030, iwl9560_2ac_cfg)}, 548 {IWL_PCI_DEVICE(0x2526, 0x4030, iwl9560_2ac_cfg)},
546 {IWL_PCI_DEVICE(0x2526, 0x40A4, iwl9460_2ac_cfg)}, 549 {IWL_PCI_DEVICE(0x2526, 0x40A4, iwl9460_2ac_cfg)},
547 {IWL_PCI_DEVICE(0x2526, 0xA014, iwl9260_2ac_cfg)}, 550 {IWL_PCI_DEVICE(0x2526, 0xA014, iwl9260_2ac_cfg)},
551 {IWL_PCI_DEVICE(0x2526, 0x42A4, iwl9462_2ac_cfg_soc)},
548 {IWL_PCI_DEVICE(0x271B, 0x0010, iwl9160_2ac_cfg)}, 552 {IWL_PCI_DEVICE(0x271B, 0x0010, iwl9160_2ac_cfg)},
549 {IWL_PCI_DEVICE(0x271B, 0x0014, iwl9160_2ac_cfg)}, 553 {IWL_PCI_DEVICE(0x271B, 0x0014, iwl9160_2ac_cfg)},
550 {IWL_PCI_DEVICE(0x271B, 0x0210, iwl9160_2ac_cfg)}, 554 {IWL_PCI_DEVICE(0x271B, 0x0210, iwl9160_2ac_cfg)},
551 {IWL_PCI_DEVICE(0x30DC, 0x0060, iwl9460_2ac_cfg)}, 555 {IWL_PCI_DEVICE(0x271B, 0x0214, iwl9260_2ac_cfg)},
552 {IWL_PCI_DEVICE(0x31DC, 0x0030, iwl9560_2ac_cfg)}, 556 {IWL_PCI_DEVICE(0x2720, 0x0034, iwl9560_2ac_cfg)},
553 {IWL_PCI_DEVICE(0x31DC, 0x0034, iwl9560_2ac_cfg)}, 557 {IWL_PCI_DEVICE(0x2720, 0x0038, iwl9560_2ac_cfg)},
554 {IWL_PCI_DEVICE(0x31DC, 0x0038, iwl9560_2ac_cfg)}, 558 {IWL_PCI_DEVICE(0x2720, 0x003C, iwl9560_2ac_cfg)},
555 {IWL_PCI_DEVICE(0x31DC, 0x003C, iwl9560_2ac_cfg)}, 559 {IWL_PCI_DEVICE(0x2720, 0x0060, iwl9461_2ac_cfg_soc)},
556 {IWL_PCI_DEVICE(0x31DC, 0x0060, iwl9460_2ac_cfg)}, 560 {IWL_PCI_DEVICE(0x2720, 0x0064, iwl9461_2ac_cfg_soc)},
557 {IWL_PCI_DEVICE(0x9DF0, 0x0000, iwl9460_2ac_cfg)}, 561 {IWL_PCI_DEVICE(0x2720, 0x00A0, iwl9462_2ac_cfg_soc)},
558 {IWL_PCI_DEVICE(0x9DF0, 0x0010, iwl9460_2ac_cfg)}, 562 {IWL_PCI_DEVICE(0x2720, 0x00A4, iwl9462_2ac_cfg_soc)},
559 {IWL_PCI_DEVICE(0x9DF0, 0x0030, iwl9560_2ac_cfg)}, 563 {IWL_PCI_DEVICE(0x2720, 0x0230, iwl9560_2ac_cfg)},
560 {IWL_PCI_DEVICE(0x9DF0, 0x0034, iwl9560_2ac_cfg)}, 564 {IWL_PCI_DEVICE(0x2720, 0x0234, iwl9560_2ac_cfg)},
561 {IWL_PCI_DEVICE(0x9DF0, 0x0038, iwl9560_2ac_cfg)}, 565 {IWL_PCI_DEVICE(0x2720, 0x0238, iwl9560_2ac_cfg)},
562 {IWL_PCI_DEVICE(0x9DF0, 0x003C, iwl9560_2ac_cfg)}, 566 {IWL_PCI_DEVICE(0x2720, 0x023C, iwl9560_2ac_cfg)},
563 {IWL_PCI_DEVICE(0x9DF0, 0x0060, iwl9460_2ac_cfg)}, 567 {IWL_PCI_DEVICE(0x2720, 0x0260, iwl9461_2ac_cfg_soc)},
564 {IWL_PCI_DEVICE(0x9DF0, 0x0210, iwl9460_2ac_cfg)}, 568 {IWL_PCI_DEVICE(0x2720, 0x0264, iwl9461_2ac_cfg_soc)},
565 {IWL_PCI_DEVICE(0x9DF0, 0x0310, iwl9460_2ac_cfg)}, 569 {IWL_PCI_DEVICE(0x2720, 0x02A0, iwl9462_2ac_cfg_soc)},
566 {IWL_PCI_DEVICE(0x9DF0, 0x0410, iwl9460_2ac_cfg)}, 570 {IWL_PCI_DEVICE(0x2720, 0x02A4, iwl9462_2ac_cfg_soc)},
567 {IWL_PCI_DEVICE(0x9DF0, 0x0510, iwl9460_2ac_cfg)}, 571 {IWL_PCI_DEVICE(0x2720, 0x4030, iwl9560_2ac_cfg)},
568 {IWL_PCI_DEVICE(0x9DF0, 0x0610, iwl9460_2ac_cfg)}, 572 {IWL_PCI_DEVICE(0x2720, 0x40A4, iwl9462_2ac_cfg_soc)},
569 {IWL_PCI_DEVICE(0x9DF0, 0x0710, iwl9460_2ac_cfg)}, 573 {IWL_PCI_DEVICE(0x30DC, 0x0060, iwl9460_2ac_cfg_soc)},
570 {IWL_PCI_DEVICE(0x9DF0, 0x0A10, iwl9460_2ac_cfg)}, 574 {IWL_PCI_DEVICE(0x30DC, 0x0064, iwl9461_2ac_cfg_soc)},
571 {IWL_PCI_DEVICE(0x9DF0, 0x2010, iwl9460_2ac_cfg)}, 575 {IWL_PCI_DEVICE(0x30DC, 0x00A0, iwl9462_2ac_cfg_soc)},
572 {IWL_PCI_DEVICE(0x9DF0, 0x2A10, iwl9460_2ac_cfg)}, 576 {IWL_PCI_DEVICE(0x30DC, 0x00A4, iwl9462_2ac_cfg_soc)},
573 {IWL_PCI_DEVICE(0xA370, 0x0030, iwl9560_2ac_cfg)}, 577 {IWL_PCI_DEVICE(0x30DC, 0x0260, iwl9461_2ac_cfg_soc)},
574 {IWL_PCI_DEVICE(0xA370, 0x0034, iwl9560_2ac_cfg)}, 578 {IWL_PCI_DEVICE(0x30DC, 0x0264, iwl9461_2ac_cfg_soc)},
575 {IWL_PCI_DEVICE(0xA370, 0x0038, iwl9560_2ac_cfg)}, 579 {IWL_PCI_DEVICE(0x30DC, 0x02A0, iwl9462_2ac_cfg_soc)},
576 {IWL_PCI_DEVICE(0xA370, 0x003C, iwl9560_2ac_cfg)}, 580 {IWL_PCI_DEVICE(0x30DC, 0x02A4, iwl9462_2ac_cfg_soc)},
577 {IWL_PCI_DEVICE(0xA370, 0x0060, iwl9460_2ac_cfg)}, 581 {IWL_PCI_DEVICE(0x31DC, 0x0030, iwl9560_2ac_cfg_soc)},
578 {IWL_PCI_DEVICE(0xA370, 0x1030, iwl9560_2ac_cfg)}, 582 {IWL_PCI_DEVICE(0x31DC, 0x0034, iwl9560_2ac_cfg_soc)},
583 {IWL_PCI_DEVICE(0x31DC, 0x0038, iwl9560_2ac_cfg_soc)},
584 {IWL_PCI_DEVICE(0x31DC, 0x003C, iwl9560_2ac_cfg_soc)},
585 {IWL_PCI_DEVICE(0x31DC, 0x0060, iwl9460_2ac_cfg_soc)},
586 {IWL_PCI_DEVICE(0x31DC, 0x0064, iwl9461_2ac_cfg_soc)},
587 {IWL_PCI_DEVICE(0x31DC, 0x00A0, iwl9462_2ac_cfg_soc)},
588 {IWL_PCI_DEVICE(0x31DC, 0x00A4, iwl9462_2ac_cfg_soc)},
589 {IWL_PCI_DEVICE(0x31DC, 0x0230, iwl9560_2ac_cfg_soc)},
590 {IWL_PCI_DEVICE(0x31DC, 0x0234, iwl9560_2ac_cfg_soc)},
591 {IWL_PCI_DEVICE(0x31DC, 0x0238, iwl9560_2ac_cfg_soc)},
592 {IWL_PCI_DEVICE(0x31DC, 0x023C, iwl9560_2ac_cfg_soc)},
593 {IWL_PCI_DEVICE(0x31DC, 0x0260, iwl9461_2ac_cfg_soc)},
594 {IWL_PCI_DEVICE(0x31DC, 0x0264, iwl9461_2ac_cfg_soc)},
595 {IWL_PCI_DEVICE(0x31DC, 0x02A0, iwl9462_2ac_cfg_soc)},
596 {IWL_PCI_DEVICE(0x31DC, 0x02A4, iwl9462_2ac_cfg_soc)},
597 {IWL_PCI_DEVICE(0x31DC, 0x4030, iwl9560_2ac_cfg_soc)},
598 {IWL_PCI_DEVICE(0x31DC, 0x4034, iwl9560_2ac_cfg_soc)},
599 {IWL_PCI_DEVICE(0x31DC, 0x40A4, iwl9462_2ac_cfg_soc)},
600 {IWL_PCI_DEVICE(0x34F0, 0x0030, iwl9560_2ac_cfg_soc)},
601 {IWL_PCI_DEVICE(0x34F0, 0x0034, iwl9560_2ac_cfg_soc)},
602 {IWL_PCI_DEVICE(0x34F0, 0x02A4, iwl9462_2ac_cfg_soc)},
603 {IWL_PCI_DEVICE(0x9DF0, 0x0000, iwl9460_2ac_cfg_soc)},
604 {IWL_PCI_DEVICE(0x9DF0, 0x0010, iwl9460_2ac_cfg_soc)},
605 {IWL_PCI_DEVICE(0x9DF0, 0x0030, iwl9560_2ac_cfg_soc)},
606 {IWL_PCI_DEVICE(0x9DF0, 0x0034, iwl9560_2ac_cfg_soc)},
607 {IWL_PCI_DEVICE(0x9DF0, 0x0038, iwl9560_2ac_cfg_soc)},
608 {IWL_PCI_DEVICE(0x9DF0, 0x003C, iwl9560_2ac_cfg_soc)},
609 {IWL_PCI_DEVICE(0x9DF0, 0x0060, iwl9460_2ac_cfg_soc)},
610 {IWL_PCI_DEVICE(0x9DF0, 0x0064, iwl9461_2ac_cfg_soc)},
611 {IWL_PCI_DEVICE(0x9DF0, 0x00A0, iwl9462_2ac_cfg_soc)},
612 {IWL_PCI_DEVICE(0x9DF0, 0x00A4, iwl9462_2ac_cfg_soc)},
613 {IWL_PCI_DEVICE(0x9DF0, 0x0210, iwl9460_2ac_cfg_soc)},
614 {IWL_PCI_DEVICE(0x9DF0, 0x0230, iwl9560_2ac_cfg_soc)},
615 {IWL_PCI_DEVICE(0x9DF0, 0x0234, iwl9560_2ac_cfg_soc)},
616 {IWL_PCI_DEVICE(0x9DF0, 0x0238, iwl9560_2ac_cfg_soc)},
617 {IWL_PCI_DEVICE(0x9DF0, 0x023C, iwl9560_2ac_cfg_soc)},
618 {IWL_PCI_DEVICE(0x9DF0, 0x0260, iwl9461_2ac_cfg_soc)},
619 {IWL_PCI_DEVICE(0x9DF0, 0x0264, iwl9461_2ac_cfg_soc)},
620 {IWL_PCI_DEVICE(0x9DF0, 0x02A0, iwl9462_2ac_cfg_soc)},
621 {IWL_PCI_DEVICE(0x9DF0, 0x02A4, iwl9462_2ac_cfg_soc)},
622 {IWL_PCI_DEVICE(0x9DF0, 0x0310, iwl9460_2ac_cfg_soc)},
623 {IWL_PCI_DEVICE(0x9DF0, 0x0410, iwl9460_2ac_cfg_soc)},
624 {IWL_PCI_DEVICE(0x9DF0, 0x0510, iwl9460_2ac_cfg_soc)},
625 {IWL_PCI_DEVICE(0x9DF0, 0x0610, iwl9460_2ac_cfg_soc)},
626 {IWL_PCI_DEVICE(0x9DF0, 0x0710, iwl9460_2ac_cfg_soc)},
627 {IWL_PCI_DEVICE(0x9DF0, 0x0A10, iwl9460_2ac_cfg_soc)},
628 {IWL_PCI_DEVICE(0x9DF0, 0x2010, iwl9460_2ac_cfg_soc)},
629 {IWL_PCI_DEVICE(0x9DF0, 0x2A10, iwl9460_2ac_cfg_soc)},
630 {IWL_PCI_DEVICE(0x9DF0, 0x4030, iwl9560_2ac_cfg_soc)},
631 {IWL_PCI_DEVICE(0x9DF0, 0x4034, iwl9560_2ac_cfg_soc)},
632 {IWL_PCI_DEVICE(0x9DF0, 0x40A4, iwl9462_2ac_cfg_soc)},
633 {IWL_PCI_DEVICE(0xA370, 0x0030, iwl9560_2ac_cfg_soc)},
634 {IWL_PCI_DEVICE(0xA370, 0x0034, iwl9560_2ac_cfg_soc)},
635 {IWL_PCI_DEVICE(0xA370, 0x0038, iwl9560_2ac_cfg_soc)},
636 {IWL_PCI_DEVICE(0xA370, 0x003C, iwl9560_2ac_cfg_soc)},
637 {IWL_PCI_DEVICE(0xA370, 0x0060, iwl9460_2ac_cfg_soc)},
638 {IWL_PCI_DEVICE(0xA370, 0x0064, iwl9461_2ac_cfg_soc)},
639 {IWL_PCI_DEVICE(0xA370, 0x00A0, iwl9462_2ac_cfg_soc)},
640 {IWL_PCI_DEVICE(0xA370, 0x00A4, iwl9462_2ac_cfg_soc)},
641 {IWL_PCI_DEVICE(0xA370, 0x0230, iwl9560_2ac_cfg_soc)},
642 {IWL_PCI_DEVICE(0xA370, 0x0234, iwl9560_2ac_cfg_soc)},
643 {IWL_PCI_DEVICE(0xA370, 0x0238, iwl9560_2ac_cfg_soc)},
644 {IWL_PCI_DEVICE(0xA370, 0x023C, iwl9560_2ac_cfg_soc)},
645 {IWL_PCI_DEVICE(0xA370, 0x0260, iwl9461_2ac_cfg_soc)},
646 {IWL_PCI_DEVICE(0xA370, 0x0264, iwl9461_2ac_cfg_soc)},
647 {IWL_PCI_DEVICE(0xA370, 0x02A0, iwl9462_2ac_cfg_soc)},
648 {IWL_PCI_DEVICE(0xA370, 0x02A4, iwl9462_2ac_cfg_soc)},
649 {IWL_PCI_DEVICE(0xA370, 0x1030, iwl9560_2ac_cfg_soc)},
650 {IWL_PCI_DEVICE(0xA370, 0x4030, iwl9560_2ac_cfg_soc)},
651 {IWL_PCI_DEVICE(0xA370, 0x4034, iwl9560_2ac_cfg_soc)},
652 {IWL_PCI_DEVICE(0xA370, 0x40A4, iwl9462_2ac_cfg_soc)},
579 653
580/* a000 Series */ 654/* a000 Series */
581 {IWL_PCI_DEVICE(0x2720, 0x0A10, iwla000_2ac_cfg_hr_cdb)}, 655 {IWL_PCI_DEVICE(0x2720, 0x0A10, iwla000_2ac_cfg_hr_cdb)},