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

Commit a85281eb authored by Sara Sharon's avatar Sara Sharon Committed by Luca Coelho
Browse files

iwlwifi: update device ID for a000 family 



Three configurations will share device ID 2720, and will
be differentiated by RF ID.

Signed-off-by: default avatarSara Sharon <sara.sharon@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 67625865

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

+2 −1
Original line number Diff line number Diff line
@@ -348,7 +348,8 @@ enum { 


/* RF_ID value */

#define CSR_HW_RF_ID_TYPE_JF		(0x00105000)

#define CSR_HW_RF_ID_TYPE_HR		(0x00109000)

#define CSR_HW_RF_ID_TYPE_HR		(0x0010A000)

#define CSR_HW_RF_ID_TYPE_HRCDB		(0x00109000)



/* EEPROM REG */

#define CSR_EEPROM_REG_READ_VALID_MSK	(0x00000001)

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

+7 −5
Original line number Diff line number Diff line
@@ -538,7 +538,7 @@ static const struct pci_device_id iwl_hw_card_ids[] = { 


/* a000 Series */

	{IWL_PCI_DEVICE(0x2720, 0x0A10, iwla000_2ac_cfg_hr_cdb)},

	{IWL_PCI_DEVICE(0x2722, 0x0A10, iwla000_2ac_cfg_hr)},

	{IWL_PCI_DEVICE(0x34F0, 0x0310, iwla000_2ac_cfg_jf)},

#endif /* CONFIG_IWLMVM */



	{0}
@@ -672,10 +672,12 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
		iwl_trans->cfg = cfg_7265d;

	}



	if (iwl_trans->cfg->rf_id &&

	    (cfg == &iwla000_2ac_cfg_hr || cfg == &iwla000_2ac_cfg_hr_cdb) &&

	     iwl_trans->hw_rf_id == CSR_HW_RF_ID_TYPE_JF) {

	if (iwl_trans->cfg->rf_id && cfg == &iwla000_2ac_cfg_hr_cdb) {

		if (iwl_trans->hw_rf_id == CSR_HW_RF_ID_TYPE_JF)

			cfg = &iwla000_2ac_cfg_jf;

		else if (iwl_trans->hw_rf_id == CSR_HW_RF_ID_TYPE_HR)

			cfg = &iwla000_2ac_cfg_hr;



		iwl_trans->cfg = cfg;

	}

#endif