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

Commit 827e9ab8 authored by Oren Givon's avatar Oren Givon Committed by Luca Coelho
Browse files

iwlwifi: add a new series 9460 with new PCI ID 



Add a new series to the 9000 series called 9460.
In addition, add a new PCI ID that is the 9460 new series.

Signed-off-by: default avatarOren Givon <oren.givon@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 486c96a7

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

+2 −2
Original line number Diff line number Diff line
@@ -156,8 +156,8 @@ const struct iwl_cfg iwl9260_2ac_cfg = { 
	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,

};



const struct iwl_cfg iwl9000_2ac_cfg = {

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

const struct iwl_cfg iwl9460_2ac_cfg = {

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

	.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
@@ -449,9 +449,9 @@ 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 iwl9000_2ac_cfg;

extern const struct iwl_cfg iwl9000lc_2ac_cfg;

extern const struct iwl_cfg iwl9260_2ac_cfg;

extern const struct iwl_cfg iwl9460_2ac_cfg;

extern const struct iwl_cfg iwla000_2ac_cfg;

#endif /* CONFIG_IWLMVM */

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

+14 −13
Original line number Diff line number Diff line
@@ -504,18 +504,19 @@ static const struct pci_device_id iwl_hw_card_ids[] = { 
/* 9000 Series */

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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



/* a000 Series */

	{IWL_PCI_DEVICE(0x2720, 0x0A10, iwla000_2ac_cfg)},
@@ -636,7 +637,7 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	}



	if (iwl_trans->cfg->rf_id) {

		if (cfg == &iwl9000_2ac_cfg &&

		if (cfg == &iwl9460_2ac_cfg &&

		    iwl_trans->hw_rf_id == CSR_HW_RF_ID_TYPE_LC) {

			cfg = &iwl9000lc_2ac_cfg;

			iwl_trans->cfg = cfg;