diff options
| author | Sara Sharon | 2016-11-23 16:08:20 +0100 |
|---|---|---|
| committer | Luca Coelho | 2017-02-06 18:19:26 +0100 |
| commit | 5594d80e9bf46d607bfcb08df0353b009dd6e2e8 (patch) | |
| tree | 3aa13e677febd3798b16909b7fbf5d1884646f1f /drivers/net/wireless/intel/iwlwifi/pcie | |
| parent | iwlwifi: remove unnecessary cfg element in iwl_drv (diff) | |
| download | kernel-qcow2-linux-5594d80e9bf46d607bfcb08df0353b009dd6e2e8.tar.gz kernel-qcow2-linux-5594d80e9bf46d607bfcb08df0353b009dd6e2e8.tar.xz kernel-qcow2-linux-5594d80e9bf46d607bfcb08df0353b009dd6e2e8.zip | |
iwlwifi: support two phys for a000 devices
Support differentiating between two phys for a000 devices
in order to load the correct firmware.
Eventually when moving completely to the new phy we will be
able to remove this.
Signed-off-by: Sara Sharon <sara.sharon@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/pcie')
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c index 43c2475346ac..618894ecfd22 100644 --- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c +++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c @@ -533,7 +533,7 @@ static const struct pci_device_id iwl_hw_card_ids[] = { {IWL_PCI_DEVICE(0xA370, 0x1030, iwl9560_2ac_cfg)}, /* a000 Series */ - {IWL_PCI_DEVICE(0x2720, 0x0A10, iwla000_2ac_cfg)}, + {IWL_PCI_DEVICE(0x2720, 0x0A10, iwla000_2ac_cfg_hr)}, #endif /* CONFIG_IWLMVM */ {0} @@ -673,6 +673,12 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) cfg = &iwl9000lc_2ac_cfg; iwl_trans->cfg = cfg; } + + if (cfg == &iwla000_2ac_cfg_hr && + iwl_trans->hw_rf_id == CSR_HW_RF_ID_TYPE_JF) { + cfg = &iwla000_2ac_cfg_jf; + iwl_trans->cfg = cfg; + } } #endif |