iwlwifi: add and edit 8000 series PCI IDs
authorOren Givon <oren.givon@intel.com>
Thu, 4 Sep 2014 07:16:49 +0000 (09:16 +0200)
committerEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Sun, 14 Sep 2014 09:56:36 +0000 (12:56 +0300)
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>
drivers/net/wireless/iwlwifi/iwl-8000.c
drivers/net/wireless/iwlwifi/iwl-config.h
drivers/net/wireless/iwlwifi/pcie/drv.c

index 23a67bfc086f3e35c774d4027d9b9b8f3c35b273..3c576ee315fd50f835d6e6a272b9d1869778ab95 100644 (file)
@@ -117,6 +117,15 @@ static const struct iwl_ht_params iwl8000_ht_params = {
        .led_mode = IWL_LED_RF_STATE,                           \
        .nvm_hw_section_num = NVM_HW_SECTION_NUM_FAMILY_8000
 
+const struct iwl_cfg iwl8260_2n_cfg = {
+       .name = "Intel(R) Dual Band Wireless N 8260",
+       .fw_name_pre = IWL8000_FW_PRE,
+       IWL_DEVICE_8000,
+       .ht_params = &iwl8000_ht_params,
+       .nvm_ver = IWL8000_NVM_VERSION,
+       .nvm_calib_ver = IWL8000_TX_POWER_VERSION,
+};
+
 const struct iwl_cfg iwl8260_2ac_cfg = {
        .name = "Intel(R) Dual Band Wireless AC 8260",
        .fw_name_pre = IWL8000_FW_PRE,
index 07c0f1fdb99379e7333591a38c5a91543a852ec9..1b9c77d9f1b82d72c801e4b5de1724cbe61259f0 100644 (file)
@@ -343,6 +343,7 @@ extern const struct iwl_cfg iwl3165_2ac_cfg;
 extern const struct iwl_cfg iwl7265_2ac_cfg;
 extern const struct iwl_cfg iwl7265_2n_cfg;
 extern const struct iwl_cfg iwl7265_n_cfg;
+extern const struct iwl_cfg iwl8260_2n_cfg;
 extern const struct iwl_cfg iwl8260_2ac_cfg;
 extern const struct iwl_cfg iwl8260_2ac_sdio_cfg;
 #endif /* CONFIG_IWLMVM */
index b9d5049e52da8f0105c52af050f5fdbd03d87da6..ca68c3ccf63308a04049b2069b95c86a25c30acf 100644 (file)
@@ -405,6 +405,7 @@ static const struct pci_device_id iwl_hw_card_ids[] = {
 
 /* 8000 Series */
        {IWL_PCI_DEVICE(0x24F3, 0x0010, iwl8260_2ac_cfg)},
+       {IWL_PCI_DEVICE(0x24F3, 0x0004, iwl8260_2n_cfg)},
        {IWL_PCI_DEVICE(0x24F4, 0x0030, iwl8260_2ac_cfg)},
 #endif /* CONFIG_IWLMVM */