Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aea2a5f0 authored by Haim Dreyfuss's avatar Haim Dreyfuss Committed by Luca Coelho
Browse files

iwlwifi: Rename 9560 to 9260 and add new PCI IDs for it 



Rename 9560 to 9260.
Add new PCI ID for 9260 and change some entries from 5165 to 9260.
Also order the 9000 series.

Signed-off-by: default avatarHaim Dreyfuss <haim.dreyfuss@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent e9eb5e33

drivers/net/wireless/intel/iwlwifi/iwl-9000.c

+2 −2
Original line number Diff line number Diff line
@@ -140,8 +140,8 @@ static const struct iwl_tt_params iwl9000_tt_params = { 
	.vht_mu_mimo_supported = true,					\

	.mac_addr_from_csr = true



const struct iwl_cfg iwl9560_2ac_cfg = {

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

const struct iwl_cfg iwl9260_2ac_cfg = {

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

		.fw_name_pre = IWL9000_FW_PRE,

		IWL_DEVICE_9000,

		.ht_params = &iwl9000_ht_params,

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

+1 −1
Original line number Diff line number Diff line
@@ -439,7 +439,7 @@ extern const struct iwl_cfg iwl4165_2ac_cfg; 
extern const struct iwl_cfg iwl8260_2ac_sdio_cfg;

extern const struct iwl_cfg iwl8265_2ac_sdio_cfg;

extern const struct iwl_cfg iwl4165_2ac_sdio_cfg;

extern const struct iwl_cfg iwl9560_2ac_cfg;

extern const struct iwl_cfg iwl9260_2ac_cfg;

extern const struct iwl_cfg iwl5165_2ac_cfg;

#endif /* CONFIG_IWLMVM */

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

+11 −10
Original line number Diff line number Diff line
@@ -493,19 +493,20 @@ static const struct pci_device_id iwl_hw_card_ids[] = { 
	{IWL_PCI_DEVICE(0x24FD, 0x8130, iwl8265_2ac_cfg)},



/* 9000 Series */

	{IWL_PCI_DEVICE(0x9DF0, 0x0A10, iwl9560_2ac_cfg)},

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

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

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

	{IWL_PCI_DEVICE(0x2526, 0x1420, iwl5165_2ac_cfg)},

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

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

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

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

	{IWL_PCI_DEVICE(0x9DF0, 0x0A10, iwl9260_2ac_cfg)},

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

	{IWL_PCI_DEVICE(0x9DF0, 0x0210, iwl9260_2ac_cfg)},

	{IWL_PCI_DEVICE(0x9DF0, 0x0410, iwl9260_2ac_cfg)},

	{IWL_PCI_DEVICE(0x9DF0, 0x0610, iwl9260_2ac_cfg)},

	{IWL_PCI_DEVICE(0x9DF0, 0x0310, iwl5165_2ac_cfg)},

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

	{IWL_PCI_DEVICE(0x9DF0, 0x0510, iwl5165_2ac_cfg)},

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

	{IWL_PCI_DEVICE(0x2526, 0x1420, iwl5165_2ac_cfg)},

	{IWL_PCI_DEVICE(0x9DF0, 0x0710, iwl5165_2ac_cfg)},

	{IWL_PCI_DEVICE(0x9DF0, 0x0210, iwl9560_2ac_cfg)},

	{IWL_PCI_DEVICE(0x9DF0, 0x0410, iwl9560_2ac_cfg)},

	{IWL_PCI_DEVICE(0x9DF0, 0x0610, iwl9560_2ac_cfg)},

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

#endif /* CONFIG_IWLMVM */



	{0}