diff options
author | Oren Givon <oren.givon@intel.com> | 2014-09-04 03:16:49 -0400 |
---|---|---|
committer | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2014-09-14 05:56:36 -0400 |
commit | d4200cb2487042291a056d4364450947344362e1 (patch) | |
tree | ec84a36f31eeffa13ab7e3e88d6a38a646ea374a /drivers/net/wireless/iwlwifi | |
parent | a3576ff28e3b6a75d79fdc33c8179e7e2b470e50 (diff) |
iwlwifi: add and edit 8000 series PCI IDs
Edit some 8000 series PCI IDs and add configuration to
Dual Band Wireless N 8260 devices.
Signed-off-by: Oren Givon <oren.givon@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-8000.c | 9 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-config.h | 1 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/pcie/drv.c | 1 |
3 files changed, 11 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-8000.c b/drivers/net/wireless/iwlwifi/iwl-8000.c index 23a67bfc086f..3c576ee315fd 100644 --- a/drivers/net/wireless/iwlwifi/iwl-8000.c +++ b/drivers/net/wireless/iwlwifi/iwl-8000.c | |||
@@ -117,6 +117,15 @@ static const struct iwl_ht_params iwl8000_ht_params = { | |||
117 | .led_mode = IWL_LED_RF_STATE, \ | 117 | .led_mode = IWL_LED_RF_STATE, \ |
118 | .nvm_hw_section_num = NVM_HW_SECTION_NUM_FAMILY_8000 | 118 | .nvm_hw_section_num = NVM_HW_SECTION_NUM_FAMILY_8000 |
119 | 119 | ||
120 | const struct iwl_cfg iwl8260_2n_cfg = { | ||
121 | .name = "Intel(R) Dual Band Wireless N 8260", | ||
122 | .fw_name_pre = IWL8000_FW_PRE, | ||
123 | IWL_DEVICE_8000, | ||
124 | .ht_params = &iwl8000_ht_params, | ||
125 | .nvm_ver = IWL8000_NVM_VERSION, | ||
126 | .nvm_calib_ver = IWL8000_TX_POWER_VERSION, | ||
127 | }; | ||
128 | |||
120 | const struct iwl_cfg iwl8260_2ac_cfg = { | 129 | const struct iwl_cfg iwl8260_2ac_cfg = { |
121 | .name = "Intel(R) Dual Band Wireless AC 8260", | 130 | .name = "Intel(R) Dual Band Wireless AC 8260", |
122 | .fw_name_pre = IWL8000_FW_PRE, | 131 | .fw_name_pre = IWL8000_FW_PRE, |
diff --git a/drivers/net/wireless/iwlwifi/iwl-config.h b/drivers/net/wireless/iwlwifi/iwl-config.h index 07c0f1fdb993..1b9c77d9f1b8 100644 --- a/drivers/net/wireless/iwlwifi/iwl-config.h +++ b/drivers/net/wireless/iwlwifi/iwl-config.h | |||
@@ -343,6 +343,7 @@ extern const struct iwl_cfg iwl3165_2ac_cfg; | |||
343 | extern const struct iwl_cfg iwl7265_2ac_cfg; | 343 | extern const struct iwl_cfg iwl7265_2ac_cfg; |
344 | extern const struct iwl_cfg iwl7265_2n_cfg; | 344 | extern const struct iwl_cfg iwl7265_2n_cfg; |
345 | extern const struct iwl_cfg iwl7265_n_cfg; | 345 | extern const struct iwl_cfg iwl7265_n_cfg; |
346 | extern const struct iwl_cfg iwl8260_2n_cfg; | ||
346 | extern const struct iwl_cfg iwl8260_2ac_cfg; | 347 | extern const struct iwl_cfg iwl8260_2ac_cfg; |
347 | extern const struct iwl_cfg iwl8260_2ac_sdio_cfg; | 348 | extern const struct iwl_cfg iwl8260_2ac_sdio_cfg; |
348 | #endif /* CONFIG_IWLMVM */ | 349 | #endif /* CONFIG_IWLMVM */ |
diff --git a/drivers/net/wireless/iwlwifi/pcie/drv.c b/drivers/net/wireless/iwlwifi/pcie/drv.c index b9d5049e52da..ca68c3ccf633 100644 --- a/drivers/net/wireless/iwlwifi/pcie/drv.c +++ b/drivers/net/wireless/iwlwifi/pcie/drv.c | |||
@@ -405,6 +405,7 @@ static const struct pci_device_id iwl_hw_card_ids[] = { | |||
405 | 405 | ||
406 | /* 8000 Series */ | 406 | /* 8000 Series */ |
407 | {IWL_PCI_DEVICE(0x24F3, 0x0010, iwl8260_2ac_cfg)}, | 407 | {IWL_PCI_DEVICE(0x24F3, 0x0010, iwl8260_2ac_cfg)}, |
408 | {IWL_PCI_DEVICE(0x24F3, 0x0004, iwl8260_2n_cfg)}, | ||
408 | {IWL_PCI_DEVICE(0x24F4, 0x0030, iwl8260_2ac_cfg)}, | 409 | {IWL_PCI_DEVICE(0x24F4, 0x0030, iwl8260_2ac_cfg)}, |
409 | #endif /* CONFIG_IWLMVM */ | 410 | #endif /* CONFIG_IWLMVM */ |
410 | 411 | ||