Commit 2edf602d authored by Luca Coelho's avatar Luca Coelho
Browse files

iwlwifi: move shared clock entries to new table 



These devices can now also be fully differentiated by using the new
parameters.  Move them all to the new table format.

Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20200309091348.11c65d195677.I8faf50b325282df4892520a3b21fbdedabbb64f0@changeid
parent c8685937

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

+0 −46
Original line number Diff line number Diff line
@@ -216,53 +216,7 @@ const struct iwl_cfg iwl9560_2ac_cfg_soc = { 
	.soc_latency = 5000,

};



const struct iwl_cfg iwl9461_2ac_cfg_shared_clk = {

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

	.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 iwl9462_2ac_cfg_shared_clk = {

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

	.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_2ac_cfg_shared_clk = {

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

	.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_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,

	IWL_DEVICE_9000,

	.integrated = true,

	.soc_latency = 5000,

	.extra_phy_cfg_flags = FW_PHY_CFG_SHARED_CLK

};



const struct iwl_cfg iwl9560_killer_s_2ac_cfg_shared_clk = {

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

	.fw_name_pre = IWL9000_FW_PRE,

	IWL_DEVICE_9000,

	.integrated = true,

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

+29 −27
Original line number Diff line number Diff line
@@ -570,6 +570,7 @@ static const struct pci_device_id iwl_hw_card_ids[] = { 
	{IWL_PCI_DEVICE(0x271B, PCI_ANY_ID, iwl9000_trans_cfg)},

	{IWL_PCI_DEVICE(0x271C, PCI_ANY_ID, iwl9000_trans_cfg)},

	{IWL_PCI_DEVICE(0x30DC, PCI_ANY_ID, iwl9000_trans_cfg)},

	{IWL_PCI_DEVICE(0x31DC, PCI_ANY_ID, iwl9000_trans_cfg)},

	{IWL_PCI_DEVICE(0x9DF0, PCI_ANY_ID, iwl9000_trans_cfg)},

	{IWL_PCI_DEVICE(0xA370, PCI_ANY_ID, iwl9000_trans_cfg)},
@@ -599,33 +600,6 @@ static const struct pci_device_id iwl_hw_card_ids[] = { 
	{IWL_PCI_DEVICE(0x2720, 0x4234, iwl9560_2ac_cfg_qu_b0_jf_b0)},

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



	{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_160_cfg_shared_clk)},

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

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

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

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

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

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

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

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

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

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

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

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

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

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

	{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_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_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_160_cfg_qu_b0_jf_b0)},
@@ -858,9 +832,37 @@ static const struct iwl_dev_info iwl_dev_info_table[] = { 
	IWL_DEV_INFO(0x2526, 0x1552, iwl9560_2ac_cfg_soc, iwl9560_killer_1550i_name),

	IWL_DEV_INFO(0x30DC, 0x1551, iwl9560_2ac_cfg_soc, iwl9560_killer_1550s_name),

	IWL_DEV_INFO(0x30DC, 0x1552, iwl9560_2ac_cfg_soc, iwl9560_killer_1550i_name),

	IWL_DEV_INFO(0x31DC, 0x1551, iwl9560_2ac_cfg_shared_clk, iwl9560_killer_1550s_name),

	IWL_DEV_INFO(0x31DC, 0x1552, iwl9560_2ac_cfg_shared_clk, iwl9560_killer_1550i_name),



	IWL_DEV_INFO(0x271C, 0x0214, iwl9260_2ac_cfg, iwl9260_1_name),



	_IWL_DEV_INFO(0x31DC, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_PU, IWL_CFG_RF_TYPE_JF1, IWL_CFG_RF_ID_JF1,

		      IWL_CFG_160, IWL_CFG_CORES_BT,

		      iwl9560_2ac_cfg_shared_clk, iwl9461_160_name),

	_IWL_DEV_INFO(0x31DC, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_PU, IWL_CFG_RF_TYPE_JF1, IWL_CFG_RF_ID_JF1,

		      IWL_CFG_NO_160, IWL_CFG_CORES_BT,

		      iwl9560_2ac_cfg_shared_clk, iwl9461_name),

	_IWL_DEV_INFO(0x31DC, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_PU, IWL_CFG_RF_TYPE_JF1, IWL_CFG_RF_ID_JF1_DIV,

		      IWL_CFG_160, IWL_CFG_CORES_BT,

		      iwl9560_2ac_cfg_shared_clk, iwl9462_160_name),

	_IWL_DEV_INFO(0x31DC, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_PU, IWL_CFG_RF_TYPE_JF1, IWL_CFG_RF_ID_JF1_DIV,

		      IWL_CFG_NO_160, IWL_CFG_CORES_BT,

		      iwl9560_2ac_cfg_shared_clk, iwl9462_name),



	_IWL_DEV_INFO(0x31DC, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_PU, IWL_CFG_RF_TYPE_JF2, IWL_CFG_RF_ID_JF,

		      IWL_CFG_160, IWL_CFG_CORES_BT,

		      iwl9560_2ac_cfg_shared_clk, iwl9560_160_name),

	_IWL_DEV_INFO(0x31DC, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_PU, IWL_CFG_RF_TYPE_JF2, IWL_CFG_RF_ID_JF,

		      IWL_CFG_NO_160, IWL_CFG_CORES_BT,

		      iwl9560_2ac_cfg_shared_clk, iwl9560_name),



	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_PU, IWL_CFG_RF_TYPE_JF1, IWL_CFG_RF_ID_JF1,

		      IWL_CFG_160, IWL_CFG_CORES_BT,

CRA Git | Maintained and supported by SUSTech CRA and CCSE