Commit 98f0d01a authored by Ihab Zhaika's avatar Ihab Zhaika Committed by Luca Coelho
Browse files

iwlwifi: update product name for 9260 and 9560 



update the product name for the some of the cards from
the series of 9260 and 9560

Signed-off-by: default avatarIhab Zhaika <ihab.zhaika@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent fdd6c941

drivers/net/wireless/intel/iwlwifi/cfg/22000.c

+6 −0
Original line number Diff line number Diff line
@@ -269,6 +269,12 @@ const struct iwl_cfg iwl9560_2ac_cfg_qu_b0_jf_b0 = { 
	IWL_DEVICE_22500,

};



const struct iwl_cfg iwl9560_2ac_160_cfg_qu_b0_jf_b0 = {

	.name = "Intel(R) Wireless-AC 9560 160MHz",

	.fw_name_pre = IWL_QU_B_JF_B_FW_PRE,

	IWL_DEVICE_22500,

};



const struct iwl_cfg killer1550i_2ac_cfg_qu_b0_jf_b0 = {

	.name = "Killer (R) Wireless-AC 1550i Wireless Network Adapter (9560NGW)",

	.fw_name_pre = IWL_QU_B_JF_B_FW_PRE,

drivers/net/wireless/intel/iwlwifi/cfg/9000.c

+29 −0
Original line number Diff line number Diff line
@@ -163,6 +163,12 @@ const struct iwl_cfg iwl9260_2ac_cfg = { 
	IWL_DEVICE_9000,

};



const struct iwl_cfg iwl9260_2ac_160_cfg = {

	.name = "Intel(R) Wireless-AC 9260 160MHz",

	.fw_name_pre = IWL9260_FW_PRE,

	IWL_DEVICE_9000,

};



const struct iwl_cfg iwl9260_killer_2ac_cfg = {

	.name = "Killer (R) Wireless-AC 1550 Wireless Network Adapter (9260NGW)",

	.fw_name_pre = IWL9260_FW_PRE,
@@ -211,6 +217,12 @@ const struct iwl_cfg iwl9560_2ac_cfg = { 
	IWL_DEVICE_9000,

};



const struct iwl_cfg iwl9560_2ac_160_cfg = {

	.name = "Intel(R) Wireless-AC 9560 160MHz",

	.fw_name_pre = IWL9260_FW_PRE,

	IWL_DEVICE_9000,

};



const struct iwl_cfg iwl9560_2ac_cfg_soc = {

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

	.fw_name_pre = IWL9000_FW_PRE,
@@ -219,6 +231,14 @@ const struct iwl_cfg iwl9560_2ac_cfg_soc = { 
	.soc_latency = 5000,

};



const struct iwl_cfg iwl9560_2ac_160_cfg_soc = {

	.name = "Intel(R) Wireless-AC 9560 160MHz",

	.fw_name_pre = IWL9000_FW_PRE,

	IWL_DEVICE_9000,

	.integrated = true,

	.soc_latency = 5000,

};



const struct iwl_cfg iwl9560_killer_2ac_cfg_soc = {

	.name = "Killer (R) Wireless-AC 1550i Wireless Network Adapter (9560NGW)",

	.fw_name_pre = IWL9000_FW_PRE,
@@ -271,6 +291,15 @@ const struct iwl_cfg iwl9560_2ac_cfg_shared_clk = { 
	.extra_phy_cfg_flags = FW_PHY_CFG_SHARED_CLK

};



const struct iwl_cfg iwl9560_2ac_160_cfg_shared_clk = {

	.name = "Intel(R) Wireless-AC 9560 160MHz",

	.fw_name_pre = IWL9000_FW_PRE,

	IWL_DEVICE_9000,

	.integrated = true,

	.soc_latency = 5000,

	.extra_phy_cfg_flags = FW_PHY_CFG_SHARED_CLK

};



const struct iwl_cfg iwl9560_killer_2ac_cfg_shared_clk = {

	.name = "Killer (R) Wireless-AC 1550i Wireless Network Adapter (9560NGW)",

	.fw_name_pre = IWL9000_FW_PRE,

drivers/net/wireless/intel/iwlwifi/iwl-config.h

+5 −0
Original line number Diff line number Diff line
@@ -545,20 +545,24 @@ extern const struct iwl_cfg iwl8275_2ac_cfg; 
extern const struct iwl_cfg iwl4165_2ac_cfg;

extern const struct iwl_cfg iwl9160_2ac_cfg;

extern const struct iwl_cfg iwl9260_2ac_cfg;

extern const struct iwl_cfg iwl9260_2ac_160_cfg;

extern const struct iwl_cfg iwl9260_killer_2ac_cfg;

extern const struct iwl_cfg iwl9270_2ac_cfg;

extern const struct iwl_cfg iwl9460_2ac_cfg;

extern const struct iwl_cfg iwl9560_2ac_cfg;

extern const struct iwl_cfg iwl9560_2ac_160_cfg;

extern const struct iwl_cfg iwl9460_2ac_cfg_soc;

extern const struct iwl_cfg iwl9461_2ac_cfg_soc;

extern const struct iwl_cfg iwl9462_2ac_cfg_soc;

extern const struct iwl_cfg iwl9560_2ac_cfg_soc;

extern const struct iwl_cfg iwl9560_2ac_160_cfg_soc;

extern const struct iwl_cfg iwl9560_killer_2ac_cfg_soc;

extern const struct iwl_cfg iwl9560_killer_s_2ac_cfg_soc;

extern const struct iwl_cfg iwl9460_2ac_cfg_shared_clk;

extern const struct iwl_cfg iwl9461_2ac_cfg_shared_clk;

extern const struct iwl_cfg iwl9462_2ac_cfg_shared_clk;

extern const struct iwl_cfg iwl9560_2ac_cfg_shared_clk;

extern const struct iwl_cfg iwl9560_2ac_160_cfg_shared_clk;

extern const struct iwl_cfg iwl9560_killer_2ac_cfg_shared_clk;

extern const struct iwl_cfg iwl9560_killer_s_2ac_cfg_shared_clk;

extern const struct iwl_cfg iwl22000_2ac_cfg_hr;
@@ -574,6 +578,7 @@ extern const struct iwl_cfg killer1650w_2ax_cfg; 
extern const struct iwl_cfg iwl9461_2ac_cfg_qu_b0_jf_b0;

extern const struct iwl_cfg iwl9462_2ac_cfg_qu_b0_jf_b0;

extern const struct iwl_cfg iwl9560_2ac_cfg_qu_b0_jf_b0;

extern const struct iwl_cfg iwl9560_2ac_160_cfg_qu_b0_jf_b0;

extern const struct iwl_cfg killer1550i_2ac_cfg_qu_b0_jf_b0;

extern const struct iwl_cfg killer1550s_2ac_cfg_qu_b0_jf_b0;

extern const struct iwl_cfg iwl22000_2ax_cfg_jf;

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

+94 −94
Original line number Diff line number Diff line
@@ -513,10 +513,10 @@ static const struct pci_device_id iwl_hw_card_ids[] = { 
	{IWL_PCI_DEVICE(0x24FD, 0x9074, iwl8265_2ac_cfg)},



/* 9000 Series */

	{IWL_PCI_DEVICE(0x02F0, 0x0030, iwl9560_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x02F0, 0x0030, iwl9560_2ac_160_cfg_soc)},

	{IWL_PCI_DEVICE(0x02F0, 0x0034, iwl9560_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x02F0, 0x0038, iwl9560_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x02F0, 0x003C, iwl9560_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x02F0, 0x0038, iwl9560_2ac_160_cfg_soc)},

	{IWL_PCI_DEVICE(0x02F0, 0x003C, iwl9560_2ac_160_cfg_soc)},

	{IWL_PCI_DEVICE(0x02F0, 0x0060, iwl9461_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x02F0, 0x0064, iwl9461_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x02F0, 0x00A0, iwl9462_2ac_cfg_soc)},
@@ -531,17 +531,17 @@ static const struct pci_device_id iwl_hw_card_ids[] = { 
	{IWL_PCI_DEVICE(0x02F0, 0x02A4, iwl9462_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x02F0, 0x1551, iwl9560_killer_s_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x02F0, 0x1552, iwl9560_killer_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x02F0, 0x2030, iwl9560_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x02F0, 0x2034, iwl9560_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x02F0, 0x4030, iwl9560_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x02F0, 0x4034, iwl9560_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x02F0, 0x2030, iwl9560_2ac_160_cfg_soc)},

	{IWL_PCI_DEVICE(0x02F0, 0x2034, iwl9560_2ac_160_cfg_soc)},

	{IWL_PCI_DEVICE(0x02F0, 0x4030, iwl9560_2ac_160_cfg_soc)},

	{IWL_PCI_DEVICE(0x02F0, 0x4034, iwl9560_2ac_160_cfg_soc)},

	{IWL_PCI_DEVICE(0x02F0, 0x40A4, iwl9462_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x02F0, 0x4234, iwl9560_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x02F0, 0x42A4, iwl9462_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x06F0, 0x0030, iwl9560_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x06F0, 0x0030, iwl9560_2ac_160_cfg_soc)},

	{IWL_PCI_DEVICE(0x06F0, 0x0034, iwl9560_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x06F0, 0x0038, iwl9560_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x06F0, 0x003C, iwl9560_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x06F0, 0x0038, iwl9560_2ac_160_cfg_soc)},

	{IWL_PCI_DEVICE(0x06F0, 0x003C, iwl9560_2ac_160_cfg_soc)},

	{IWL_PCI_DEVICE(0x06F0, 0x0060, iwl9461_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x06F0, 0x0064, iwl9461_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x06F0, 0x00A0, iwl9462_2ac_cfg_soc)},
@@ -556,21 +556,21 @@ static const struct pci_device_id iwl_hw_card_ids[] = { 
	{IWL_PCI_DEVICE(0x06F0, 0x02A4, iwl9462_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x06F0, 0x1551, iwl9560_killer_s_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x06F0, 0x1552, iwl9560_killer_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x06F0, 0x2030, iwl9560_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x06F0, 0x2034, iwl9560_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x06F0, 0x4030, iwl9560_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x06F0, 0x4034, iwl9560_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x06F0, 0x2030, iwl9560_2ac_160_cfg_soc)},

	{IWL_PCI_DEVICE(0x06F0, 0x2034, iwl9560_2ac_160_cfg_soc)},

	{IWL_PCI_DEVICE(0x06F0, 0x4030, iwl9560_2ac_160_cfg_soc)},

	{IWL_PCI_DEVICE(0x06F0, 0x4034, iwl9560_2ac_160_cfg_soc)},

	{IWL_PCI_DEVICE(0x06F0, 0x40A4, iwl9462_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x06F0, 0x4234, iwl9560_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x06F0, 0x42A4, iwl9462_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x2526, 0x0010, iwl9260_2ac_cfg)},

	{IWL_PCI_DEVICE(0x2526, 0x0014, iwl9260_2ac_cfg)},

	{IWL_PCI_DEVICE(0x2526, 0x0018, iwl9260_2ac_cfg)},

	{IWL_PCI_DEVICE(0x2526, 0x001C, iwl9260_2ac_cfg)},

	{IWL_PCI_DEVICE(0x2526, 0x0030, iwl9560_2ac_cfg)},

	{IWL_PCI_DEVICE(0x2526, 0x0010, iwl9260_2ac_160_cfg)},

	{IWL_PCI_DEVICE(0x2526, 0x0014, iwl9260_2ac_160_cfg)},

	{IWL_PCI_DEVICE(0x2526, 0x0018, iwl9260_2ac_160_cfg)},

	{IWL_PCI_DEVICE(0x2526, 0x001C, iwl9260_2ac_160_cfg)},

	{IWL_PCI_DEVICE(0x2526, 0x0030, iwl9560_2ac_160_cfg)},

	{IWL_PCI_DEVICE(0x2526, 0x0034, iwl9560_2ac_cfg)},

	{IWL_PCI_DEVICE(0x2526, 0x0038, iwl9560_2ac_cfg)},

	{IWL_PCI_DEVICE(0x2526, 0x003C, iwl9560_2ac_cfg)},

	{IWL_PCI_DEVICE(0x2526, 0x0038, iwl9560_2ac_160_cfg)},

	{IWL_PCI_DEVICE(0x2526, 0x003C, iwl9560_2ac_160_cfg)},

	{IWL_PCI_DEVICE(0x2526, 0x0060, iwl9460_2ac_cfg)},

	{IWL_PCI_DEVICE(0x2526, 0x0064, iwl9460_2ac_cfg)},

	{IWL_PCI_DEVICE(0x2526, 0x00A0, iwl9460_2ac_cfg)},
@@ -594,26 +594,26 @@ static const struct pci_device_id iwl_hw_card_ids[] = { 
	{IWL_PCI_DEVICE(0x2526, 0x1551, iwl9560_killer_s_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x2526, 0x1552, iwl9560_killer_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x2526, 0x1610, iwl9270_2ac_cfg)},

	{IWL_PCI_DEVICE(0x2526, 0x2030, iwl9560_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x2526, 0x2034, iwl9560_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x2526, 0x4010, iwl9260_2ac_cfg)},

	{IWL_PCI_DEVICE(0x2526, 0x401C, iwl9260_2ac_cfg)},

	{IWL_PCI_DEVICE(0x2526, 0x4030, iwl9560_2ac_cfg)},

	{IWL_PCI_DEVICE(0x2526, 0x4034, iwl9560_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x2526, 0x2030, iwl9560_2ac_160_cfg_soc)},

	{IWL_PCI_DEVICE(0x2526, 0x2034, iwl9560_2ac_160_cfg_soc)},

	{IWL_PCI_DEVICE(0x2526, 0x4010, iwl9260_2ac_160_cfg)},

	{IWL_PCI_DEVICE(0x2526, 0x401C, iwl9260_2ac_160_cfg)},

	{IWL_PCI_DEVICE(0x2526, 0x4030, iwl9560_2ac_160_cfg)},

	{IWL_PCI_DEVICE(0x2526, 0x4034, iwl9560_2ac_160_cfg_soc)},

	{IWL_PCI_DEVICE(0x2526, 0x40A4, iwl9460_2ac_cfg)},

	{IWL_PCI_DEVICE(0x2526, 0x4234, iwl9560_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x2526, 0x42A4, iwl9462_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x2526, 0x8014, iwl9260_2ac_cfg)},

	{IWL_PCI_DEVICE(0x2526, 0x8010, iwl9260_2ac_cfg)},

	{IWL_PCI_DEVICE(0x2526, 0xA014, iwl9260_2ac_cfg)},

	{IWL_PCI_DEVICE(0x2526, 0x8014, iwl9260_2ac_160_cfg)},

	{IWL_PCI_DEVICE(0x2526, 0x8010, iwl9260_2ac_160_cfg)},

	{IWL_PCI_DEVICE(0x2526, 0xA014, iwl9260_2ac_160_cfg)},

	{IWL_PCI_DEVICE(0x271B, 0x0010, iwl9160_2ac_cfg)},

	{IWL_PCI_DEVICE(0x271B, 0x0014, iwl9160_2ac_cfg)},

	{IWL_PCI_DEVICE(0x271B, 0x0210, iwl9160_2ac_cfg)},

	{IWL_PCI_DEVICE(0x271B, 0x0214, iwl9260_2ac_cfg)},

	{IWL_PCI_DEVICE(0x271C, 0x0214, iwl9260_2ac_cfg)},

	{IWL_PCI_DEVICE(0x2720, 0x0034, iwl9560_2ac_cfg)},

	{IWL_PCI_DEVICE(0x2720, 0x0038, iwl9560_2ac_cfg)},

	{IWL_PCI_DEVICE(0x2720, 0x003C, iwl9560_2ac_cfg)},

	{IWL_PCI_DEVICE(0x2720, 0x0034, iwl9560_2ac_160_cfg)},

	{IWL_PCI_DEVICE(0x2720, 0x0038, iwl9560_2ac_160_cfg)},

	{IWL_PCI_DEVICE(0x2720, 0x003C, iwl9560_2ac_160_cfg)},

	{IWL_PCI_DEVICE(0x2720, 0x0060, iwl9461_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x2720, 0x0064, iwl9461_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x2720, 0x00A0, iwl9462_2ac_cfg_soc)},
@@ -631,17 +631,17 @@ static const struct pci_device_id iwl_hw_card_ids[] = { 
	{IWL_PCI_DEVICE(0x2720, 0x1210, iwl9260_2ac_cfg)},

	{IWL_PCI_DEVICE(0x2720, 0x1551, iwl9560_killer_s_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x2720, 0x1552, iwl9560_killer_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x2720, 0x2030, iwl9560_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x2720, 0x2034, iwl9560_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x2720, 0x4030, iwl9560_2ac_cfg)},

	{IWL_PCI_DEVICE(0x2720, 0x4034, iwl9560_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x2720, 0x2030, iwl9560_2ac_160_cfg_soc)},

	{IWL_PCI_DEVICE(0x2720, 0x2034, iwl9560_2ac_160_cfg_soc)},

	{IWL_PCI_DEVICE(0x2720, 0x4030, iwl9560_2ac_160_cfg)},

	{IWL_PCI_DEVICE(0x2720, 0x4034, iwl9560_2ac_160_cfg_soc)},

	{IWL_PCI_DEVICE(0x2720, 0x40A4, iwl9462_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x2720, 0x4234, iwl9560_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x2720, 0x42A4, iwl9462_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x30DC, 0x0030, iwl9560_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x30DC, 0x0030, iwl9560_2ac_160_cfg_soc)},

	{IWL_PCI_DEVICE(0x30DC, 0x0034, iwl9560_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x30DC, 0x0038, iwl9560_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x30DC, 0x003C, iwl9560_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x30DC, 0x0038, iwl9560_2ac_160_cfg_soc)},

	{IWL_PCI_DEVICE(0x30DC, 0x003C, iwl9560_2ac_160_cfg_soc)},

	{IWL_PCI_DEVICE(0x30DC, 0x0060, iwl9460_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x30DC, 0x0064, iwl9461_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x30DC, 0x00A0, iwl9462_2ac_cfg_soc)},
@@ -659,17 +659,17 @@ static const struct pci_device_id iwl_hw_card_ids[] = { 
	{IWL_PCI_DEVICE(0x30DC, 0x1210, iwl9260_2ac_cfg)},

	{IWL_PCI_DEVICE(0x30DC, 0x1551, iwl9560_killer_s_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x30DC, 0x1552, iwl9560_killer_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x30DC, 0x2030, iwl9560_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x30DC, 0x2034, iwl9560_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x30DC, 0x4030, iwl9560_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x30DC, 0x4034, iwl9560_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x30DC, 0x2030, iwl9560_2ac_160_cfg_soc)},

	{IWL_PCI_DEVICE(0x30DC, 0x2034, iwl9560_2ac_160_cfg_soc)},

	{IWL_PCI_DEVICE(0x30DC, 0x4030, iwl9560_2ac_160_cfg_soc)},

	{IWL_PCI_DEVICE(0x30DC, 0x4034, iwl9560_2ac_160_cfg_soc)},

	{IWL_PCI_DEVICE(0x30DC, 0x40A4, iwl9462_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x30DC, 0x4234, iwl9560_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x30DC, 0x42A4, iwl9462_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x31DC, 0x0030, iwl9560_2ac_cfg_shared_clk)},

	{IWL_PCI_DEVICE(0x31DC, 0x0030, iwl9560_2ac_160_cfg_shared_clk)},

	{IWL_PCI_DEVICE(0x31DC, 0x0034, iwl9560_2ac_cfg_shared_clk)},

	{IWL_PCI_DEVICE(0x31DC, 0x0038, iwl9560_2ac_cfg_shared_clk)},

	{IWL_PCI_DEVICE(0x31DC, 0x003C, iwl9560_2ac_cfg_shared_clk)},

	{IWL_PCI_DEVICE(0x31DC, 0x0038, iwl9560_2ac_160_cfg_shared_clk)},

	{IWL_PCI_DEVICE(0x31DC, 0x003C, iwl9560_2ac_160_cfg_shared_clk)},

	{IWL_PCI_DEVICE(0x31DC, 0x0060, iwl9460_2ac_cfg_shared_clk)},

	{IWL_PCI_DEVICE(0x31DC, 0x0064, iwl9461_2ac_cfg_shared_clk)},

	{IWL_PCI_DEVICE(0x31DC, 0x00A0, iwl9462_2ac_cfg_shared_clk)},
@@ -687,18 +687,18 @@ static const struct pci_device_id iwl_hw_card_ids[] = { 
	{IWL_PCI_DEVICE(0x31DC, 0x1210, iwl9260_2ac_cfg)},

	{IWL_PCI_DEVICE(0x31DC, 0x1551, iwl9560_killer_s_2ac_cfg_shared_clk)},

	{IWL_PCI_DEVICE(0x31DC, 0x1552, iwl9560_killer_2ac_cfg_shared_clk)},

	{IWL_PCI_DEVICE(0x31DC, 0x2030, iwl9560_2ac_cfg_shared_clk)},

	{IWL_PCI_DEVICE(0x31DC, 0x2034, iwl9560_2ac_cfg_shared_clk)},

	{IWL_PCI_DEVICE(0x31DC, 0x4030, iwl9560_2ac_cfg_shared_clk)},

	{IWL_PCI_DEVICE(0x31DC, 0x4034, iwl9560_2ac_cfg_shared_clk)},

	{IWL_PCI_DEVICE(0x31DC, 0x2030, iwl9560_2ac_160_cfg_shared_clk)},

	{IWL_PCI_DEVICE(0x31DC, 0x2034, iwl9560_2ac_160_cfg_shared_clk)},

	{IWL_PCI_DEVICE(0x31DC, 0x4030, iwl9560_2ac_160_cfg_shared_clk)},

	{IWL_PCI_DEVICE(0x31DC, 0x4034, iwl9560_2ac_160_cfg_shared_clk)},

	{IWL_PCI_DEVICE(0x31DC, 0x40A4, iwl9462_2ac_cfg_shared_clk)},

	{IWL_PCI_DEVICE(0x31DC, 0x4234, iwl9560_2ac_cfg_shared_clk)},

	{IWL_PCI_DEVICE(0x31DC, 0x42A4, iwl9462_2ac_cfg_shared_clk)},



	{IWL_PCI_DEVICE(0x34F0, 0x0030, iwl9560_2ac_cfg_qu_b0_jf_b0)},

	{IWL_PCI_DEVICE(0x34F0, 0x0030, iwl9560_2ac_160_cfg_qu_b0_jf_b0)},

	{IWL_PCI_DEVICE(0x34F0, 0x0034, iwl9560_2ac_cfg_qu_b0_jf_b0)},

	{IWL_PCI_DEVICE(0x34F0, 0x0038, iwl9560_2ac_cfg_qu_b0_jf_b0)},

	{IWL_PCI_DEVICE(0x34F0, 0x003C, iwl9560_2ac_cfg_qu_b0_jf_b0)},

	{IWL_PCI_DEVICE(0x34F0, 0x0038, iwl9560_2ac_160_cfg_qu_b0_jf_b0)},

	{IWL_PCI_DEVICE(0x34F0, 0x003C, iwl9560_2ac_160_cfg_qu_b0_jf_b0)},

	{IWL_PCI_DEVICE(0x34F0, 0x0060, iwl9461_2ac_cfg_qu_b0_jf_b0)},

	{IWL_PCI_DEVICE(0x34F0, 0x0064, iwl9461_2ac_cfg_qu_b0_jf_b0)},

	{IWL_PCI_DEVICE(0x34F0, 0x00A0, iwl9462_2ac_cfg_qu_b0_jf_b0)},
@@ -713,18 +713,18 @@ static const struct pci_device_id iwl_hw_card_ids[] = { 
	{IWL_PCI_DEVICE(0x34F0, 0x02A4, iwl9462_2ac_cfg_qu_b0_jf_b0)},

	{IWL_PCI_DEVICE(0x34F0, 0x1551, killer1550s_2ac_cfg_qu_b0_jf_b0)},

	{IWL_PCI_DEVICE(0x34F0, 0x1552, killer1550i_2ac_cfg_qu_b0_jf_b0)},

	{IWL_PCI_DEVICE(0x34F0, 0x2030, iwl9560_2ac_cfg_qu_b0_jf_b0)},

	{IWL_PCI_DEVICE(0x34F0, 0x2034, iwl9560_2ac_cfg_qu_b0_jf_b0)},

	{IWL_PCI_DEVICE(0x34F0, 0x4030, iwl9560_2ac_cfg_qu_b0_jf_b0)},

	{IWL_PCI_DEVICE(0x34F0, 0x4034, iwl9560_2ac_cfg_qu_b0_jf_b0)},

	{IWL_PCI_DEVICE(0x34F0, 0x2030, iwl9560_2ac_160_cfg_qu_b0_jf_b0)},

	{IWL_PCI_DEVICE(0x34F0, 0x2034, iwl9560_2ac_160_cfg_qu_b0_jf_b0)},

	{IWL_PCI_DEVICE(0x34F0, 0x4030, iwl9560_2ac_160_cfg_qu_b0_jf_b0)},

	{IWL_PCI_DEVICE(0x34F0, 0x4034, iwl9560_2ac_160_cfg_qu_b0_jf_b0)},

	{IWL_PCI_DEVICE(0x34F0, 0x40A4, iwl9462_2ac_cfg_qu_b0_jf_b0)},

	{IWL_PCI_DEVICE(0x34F0, 0x4234, iwl9560_2ac_cfg_qu_b0_jf_b0)},

	{IWL_PCI_DEVICE(0x34F0, 0x42A4, iwl9462_2ac_cfg_qu_b0_jf_b0)},



	{IWL_PCI_DEVICE(0x3DF0, 0x0030, iwl9560_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x3DF0, 0x0030, iwl9560_2ac_160_cfg_soc)},

	{IWL_PCI_DEVICE(0x3DF0, 0x0034, iwl9560_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x3DF0, 0x0038, iwl9560_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x3DF0, 0x003C, iwl9560_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x3DF0, 0x0038, iwl9560_2ac_160_cfg_soc)},

	{IWL_PCI_DEVICE(0x3DF0, 0x003C, iwl9560_2ac_160_cfg_soc)},

	{IWL_PCI_DEVICE(0x3DF0, 0x0060, iwl9461_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x3DF0, 0x0064, iwl9461_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x3DF0, 0x00A0, iwl9462_2ac_cfg_soc)},
@@ -742,17 +742,17 @@ static const struct pci_device_id iwl_hw_card_ids[] = { 
	{IWL_PCI_DEVICE(0x3DF0, 0x1210, iwl9260_2ac_cfg)},

	{IWL_PCI_DEVICE(0x3DF0, 0x1551, iwl9560_killer_s_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x3DF0, 0x1552, iwl9560_killer_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x3DF0, 0x2030, iwl9560_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x3DF0, 0x2034, iwl9560_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x3DF0, 0x4030, iwl9560_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x3DF0, 0x4034, iwl9560_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x3DF0, 0x2030, iwl9560_2ac_160_cfg_soc)},

	{IWL_PCI_DEVICE(0x3DF0, 0x2034, iwl9560_2ac_160_cfg_soc)},

	{IWL_PCI_DEVICE(0x3DF0, 0x4030, iwl9560_2ac_160_cfg_soc)},

	{IWL_PCI_DEVICE(0x3DF0, 0x4034, iwl9560_2ac_160_cfg_soc)},

	{IWL_PCI_DEVICE(0x3DF0, 0x40A4, iwl9462_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x3DF0, 0x4234, iwl9560_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x3DF0, 0x42A4, iwl9462_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x43F0, 0x0030, iwl9560_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x43F0, 0x0030, iwl9560_2ac_160_cfg_soc)},

	{IWL_PCI_DEVICE(0x43F0, 0x0034, iwl9560_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x43F0, 0x0038, iwl9560_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x43F0, 0x003C, iwl9560_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x43F0, 0x0038, iwl9560_2ac_160_cfg_soc)},

	{IWL_PCI_DEVICE(0x43F0, 0x003C, iwl9560_2ac_160_cfg_soc)},

	{IWL_PCI_DEVICE(0x43F0, 0x0060, iwl9461_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x43F0, 0x0064, iwl9461_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x43F0, 0x00A0, iwl9462_2ac_cfg_soc)},
@@ -770,19 +770,19 @@ static const struct pci_device_id iwl_hw_card_ids[] = { 
	{IWL_PCI_DEVICE(0x43F0, 0x1210, iwl9260_2ac_cfg)},

	{IWL_PCI_DEVICE(0x43F0, 0x1551, iwl9560_killer_s_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x43F0, 0x1552, iwl9560_killer_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x43F0, 0x2030, iwl9560_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x43F0, 0x2034, iwl9560_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x43F0, 0x4030, iwl9560_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x43F0, 0x4034, iwl9560_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x43F0, 0x2030, iwl9560_2ac_160_cfg_soc)},

	{IWL_PCI_DEVICE(0x43F0, 0x2034, iwl9560_2ac_160_cfg_soc)},

	{IWL_PCI_DEVICE(0x43F0, 0x4030, iwl9560_2ac_160_cfg_soc)},

	{IWL_PCI_DEVICE(0x43F0, 0x4034, iwl9560_2ac_160_cfg_soc)},

	{IWL_PCI_DEVICE(0x43F0, 0x40A4, iwl9462_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x43F0, 0x4234, iwl9560_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x43F0, 0x42A4, iwl9462_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x9DF0, 0x0000, iwl9460_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x9DF0, 0x0010, iwl9460_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x9DF0, 0x0030, iwl9560_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x9DF0, 0x0030, iwl9560_2ac_160_cfg_soc)},

	{IWL_PCI_DEVICE(0x9DF0, 0x0034, iwl9560_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x9DF0, 0x0038, iwl9560_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x9DF0, 0x003C, iwl9560_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x9DF0, 0x0038, iwl9560_2ac_160_cfg_soc)},

	{IWL_PCI_DEVICE(0x9DF0, 0x003C, iwl9560_2ac_160_cfg_soc)},

	{IWL_PCI_DEVICE(0x9DF0, 0x0060, iwl9460_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x9DF0, 0x0064, iwl9461_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x9DF0, 0x00A0, iwl9462_2ac_cfg_soc)},
@@ -808,18 +808,18 @@ static const struct pci_device_id iwl_hw_card_ids[] = { 
	{IWL_PCI_DEVICE(0x9DF0, 0x1551, iwl9560_killer_s_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x9DF0, 0x1552, iwl9560_killer_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x9DF0, 0x2010, iwl9460_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x9DF0, 0x2030, iwl9560_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x9DF0, 0x2034, iwl9560_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x9DF0, 0x2030, iwl9560_2ac_160_cfg_soc)},

	{IWL_PCI_DEVICE(0x9DF0, 0x2034, iwl9560_2ac_160_cfg_soc)},

	{IWL_PCI_DEVICE(0x9DF0, 0x2A10, iwl9460_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x9DF0, 0x4030, iwl9560_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x9DF0, 0x4034, iwl9560_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x9DF0, 0x4030, iwl9560_2ac_160_cfg_soc)},

	{IWL_PCI_DEVICE(0x9DF0, 0x4034, iwl9560_2ac_160_cfg_soc)},

	{IWL_PCI_DEVICE(0x9DF0, 0x40A4, iwl9462_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x9DF0, 0x4234, iwl9560_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0x9DF0, 0x42A4, iwl9462_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0xA0F0, 0x0030, iwl9560_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0xA0F0, 0x0030, iwl9560_2ac_160_cfg_soc)},

	{IWL_PCI_DEVICE(0xA0F0, 0x0034, iwl9560_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0xA0F0, 0x0038, iwl9560_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0xA0F0, 0x003C, iwl9560_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0xA0F0, 0x0038, iwl9560_2ac_160_cfg_soc)},

	{IWL_PCI_DEVICE(0xA0F0, 0x003C, iwl9560_2ac_160_cfg_soc)},

	{IWL_PCI_DEVICE(0xA0F0, 0x0060, iwl9461_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0xA0F0, 0x0064, iwl9461_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0xA0F0, 0x00A0, iwl9462_2ac_cfg_soc)},
@@ -837,17 +837,17 @@ static const struct pci_device_id iwl_hw_card_ids[] = { 
	{IWL_PCI_DEVICE(0xA0F0, 0x1210, iwl9260_2ac_cfg)},

	{IWL_PCI_DEVICE(0xA0F0, 0x1551, iwl9560_killer_s_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0xA0F0, 0x1552, iwl9560_killer_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0xA0F0, 0x2030, iwl9560_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0xA0F0, 0x2034, iwl9560_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0xA0F0, 0x4030, iwl9560_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0xA0F0, 0x4034, iwl9560_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0xA0F0, 0x2030, iwl9560_2ac_160_cfg_soc)},

	{IWL_PCI_DEVICE(0xA0F0, 0x2034, iwl9560_2ac_160_cfg_soc)},

	{IWL_PCI_DEVICE(0xA0F0, 0x4030, iwl9560_2ac_160_cfg_soc)},

	{IWL_PCI_DEVICE(0xA0F0, 0x4034, iwl9560_2ac_160_cfg_soc)},

	{IWL_PCI_DEVICE(0xA0F0, 0x40A4, iwl9462_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0xA0F0, 0x4234, iwl9560_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0xA0F0, 0x42A4, iwl9462_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0xA370, 0x0030, iwl9560_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0xA370, 0x0030, iwl9560_2ac_160_cfg_soc)},

	{IWL_PCI_DEVICE(0xA370, 0x0034, iwl9560_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0xA370, 0x0038, iwl9560_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0xA370, 0x003C, iwl9560_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0xA370, 0x0038, iwl9560_2ac_160_cfg_soc)},

	{IWL_PCI_DEVICE(0xA370, 0x003C, iwl9560_2ac_160_cfg_soc)},

	{IWL_PCI_DEVICE(0xA370, 0x0060, iwl9460_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0xA370, 0x0064, iwl9461_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0xA370, 0x00A0, iwl9462_2ac_cfg_soc)},
@@ -865,10 +865,10 @@ static const struct pci_device_id iwl_hw_card_ids[] = { 
	{IWL_PCI_DEVICE(0xA370, 0x1210, iwl9260_2ac_cfg)},

	{IWL_PCI_DEVICE(0xA370, 0x1551, iwl9560_killer_s_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0xA370, 0x1552, iwl9560_killer_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0xA370, 0x2030, iwl9560_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0xA370, 0x2034, iwl9560_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0xA370, 0x4030, iwl9560_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0xA370, 0x4034, iwl9560_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0xA370, 0x2030, iwl9560_2ac_160_cfg_soc)},

	{IWL_PCI_DEVICE(0xA370, 0x2034, iwl9560_2ac_160_cfg_soc)},

	{IWL_PCI_DEVICE(0xA370, 0x4030, iwl9560_2ac_160_cfg_soc)},

	{IWL_PCI_DEVICE(0xA370, 0x4034, iwl9560_2ac_160_cfg_soc)},

	{IWL_PCI_DEVICE(0xA370, 0x40A4, iwl9462_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0xA370, 0x4234, iwl9560_2ac_cfg_soc)},

	{IWL_PCI_DEVICE(0xA370, 0x42A4, iwl9462_2ac_cfg_soc)},
@@ -891,7 +891,7 @@ static const struct pci_device_id iwl_hw_card_ids[] = { 
	{IWL_PCI_DEVICE(0x06F0, 0x1652, killer1650i_2ax_cfg_qu_b0_hr_b0)},

	{IWL_PCI_DEVICE(0x06F0, 0x4070, iwl22560_2ax_cfg_hr)},

	{IWL_PCI_DEVICE(0x2720, 0x0000, iwl22560_2ax_cfg_hr)},

	{IWL_PCI_DEVICE(0x2720, 0x0030, iwl22000_2ac_cfg_hr_cdb)},

	{IWL_PCI_DEVICE(0x2720, 0x0030, iwl9560_2ac_160_cfg_soc)},

	{IWL_PCI_DEVICE(0x2720, 0x0040, iwl22560_2ax_cfg_hr)},

	{IWL_PCI_DEVICE(0x2720, 0x0070, iwl22000_2ac_cfg_hr_cdb)},

	{IWL_PCI_DEVICE(0x2720, 0x0074, iwl22560_2ax_cfg_hr)},