diff options
author | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2009-11-20 15:05:03 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-11-23 17:05:35 -0500 |
commit | ac592574a577162183b5c1dd040a188caa068a29 (patch) | |
tree | 04d19b0228a321c963813c8c089777d0d9ea7d5a /drivers/net/wireless/iwlwifi | |
parent | 0fd95afc7b8ae19045dc03ffeafb3afda78cb681 (diff) |
iwlwifi: update supported PCI_ID list for 5xx0 series
Update the PCI_ID list for 5xx0 series.
Remove all the PCI_IDs which never made into production or not longer in
production.
Also make sure the supported bands(a/b/g/n) match specified PCI_IDs
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-5000.c | 29 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn.c | 74 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-dev.h | 3 |
3 files changed, 84 insertions, 22 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c index 90c7b897736d..9175158f3580 100644 --- a/drivers/net/wireless/iwlwifi/iwl-5000.c +++ b/drivers/net/wireless/iwlwifi/iwl-5000.c | |||
@@ -1600,12 +1600,12 @@ struct iwl_cfg iwl5300_agn_cfg = { | |||
1600 | .sm_ps_mode = WLAN_HT_CAP_SM_PS_DISABLED, | 1600 | .sm_ps_mode = WLAN_HT_CAP_SM_PS_DISABLED, |
1601 | }; | 1601 | }; |
1602 | 1602 | ||
1603 | struct iwl_cfg iwl5100_bg_cfg = { | 1603 | struct iwl_cfg iwl5100_bgn_cfg = { |
1604 | .name = "5100BG", | 1604 | .name = "5100BGN", |
1605 | .fw_name_pre = IWL5000_FW_PRE, | 1605 | .fw_name_pre = IWL5000_FW_PRE, |
1606 | .ucode_api_max = IWL5000_UCODE_API_MAX, | 1606 | .ucode_api_max = IWL5000_UCODE_API_MAX, |
1607 | .ucode_api_min = IWL5000_UCODE_API_MIN, | 1607 | .ucode_api_min = IWL5000_UCODE_API_MIN, |
1608 | .sku = IWL_SKU_G, | 1608 | .sku = IWL_SKU_G|IWL_SKU_N, |
1609 | .ops = &iwl5000_ops, | 1609 | .ops = &iwl5000_ops, |
1610 | .eeprom_size = IWL_5000_EEPROM_IMG_SIZE, | 1610 | .eeprom_size = IWL_5000_EEPROM_IMG_SIZE, |
1611 | .eeprom_ver = EEPROM_5000_EEPROM_VERSION, | 1611 | .eeprom_ver = EEPROM_5000_EEPROM_VERSION, |
@@ -1641,7 +1641,6 @@ struct iwl_cfg iwl5100_abg_cfg = { | |||
1641 | .pll_cfg_val = CSR50_ANA_PLL_CFG_VAL, | 1641 | .pll_cfg_val = CSR50_ANA_PLL_CFG_VAL, |
1642 | .set_l0s = true, | 1642 | .set_l0s = true, |
1643 | .use_bsm = false, | 1643 | .use_bsm = false, |
1644 | .ht_greenfield_support = true, | ||
1645 | .led_compensation = 51, | 1644 | .led_compensation = 51, |
1646 | .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS, | 1645 | .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS, |
1647 | }; | 1646 | }; |
@@ -1718,6 +1717,28 @@ struct iwl_cfg iwl5150_agn_cfg = { | |||
1718 | .sm_ps_mode = WLAN_HT_CAP_SM_PS_DISABLED, | 1717 | .sm_ps_mode = WLAN_HT_CAP_SM_PS_DISABLED, |
1719 | }; | 1718 | }; |
1720 | 1719 | ||
1720 | struct iwl_cfg iwl5150_abg_cfg = { | ||
1721 | .name = "5150ABG", | ||
1722 | .fw_name_pre = IWL5150_FW_PRE, | ||
1723 | .ucode_api_max = IWL5150_UCODE_API_MAX, | ||
1724 | .ucode_api_min = IWL5150_UCODE_API_MIN, | ||
1725 | .sku = IWL_SKU_A|IWL_SKU_G, | ||
1726 | .ops = &iwl5150_ops, | ||
1727 | .eeprom_size = IWL_5000_EEPROM_IMG_SIZE, | ||
1728 | .eeprom_ver = EEPROM_5050_EEPROM_VERSION, | ||
1729 | .eeprom_calib_ver = EEPROM_5050_TX_POWER_VERSION, | ||
1730 | .num_of_queues = IWL50_NUM_QUEUES, | ||
1731 | .num_of_ampdu_queues = IWL50_NUM_AMPDU_QUEUES, | ||
1732 | .mod_params = &iwl50_mod_params, | ||
1733 | .valid_tx_ant = ANT_A, | ||
1734 | .valid_rx_ant = ANT_AB, | ||
1735 | .pll_cfg_val = CSR50_ANA_PLL_CFG_VAL, | ||
1736 | .set_l0s = true, | ||
1737 | .use_bsm = false, | ||
1738 | .led_compensation = 51, | ||
1739 | .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS, | ||
1740 | }; | ||
1741 | |||
1721 | MODULE_FIRMWARE(IWL5000_MODULE_FIRMWARE(IWL5000_UCODE_API_MAX)); | 1742 | MODULE_FIRMWARE(IWL5000_MODULE_FIRMWARE(IWL5000_UCODE_API_MAX)); |
1722 | MODULE_FIRMWARE(IWL5150_MODULE_FIRMWARE(IWL5150_UCODE_API_MAX)); | 1743 | MODULE_FIRMWARE(IWL5150_MODULE_FIRMWARE(IWL5150_UCODE_API_MAX)); |
1723 | 1744 | ||
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c index 7301aa73ab7e..92f9df6a04a6 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c | |||
@@ -3541,23 +3541,63 @@ static struct pci_device_id iwl_hw_card_ids[] = { | |||
3541 | {IWL_PCI_DEVICE(0x4230, PCI_ANY_ID, iwl4965_agn_cfg)}, | 3541 | {IWL_PCI_DEVICE(0x4230, PCI_ANY_ID, iwl4965_agn_cfg)}, |
3542 | #endif /* CONFIG_IWL4965 */ | 3542 | #endif /* CONFIG_IWL4965 */ |
3543 | #ifdef CONFIG_IWL5000 | 3543 | #ifdef CONFIG_IWL5000 |
3544 | {IWL_PCI_DEVICE(0x4232, 0x1205, iwl5100_bg_cfg)}, | 3544 | /* 5100 Series WiFi */ |
3545 | {IWL_PCI_DEVICE(0x4232, 0x1305, iwl5100_bg_cfg)}, | 3545 | {IWL_PCI_DEVICE(0x4232, 0x1201, iwl5100_agn_cfg)}, /* Mini Card */ |
3546 | {IWL_PCI_DEVICE(0x4232, 0x1206, iwl5100_abg_cfg)}, | 3546 | {IWL_PCI_DEVICE(0x4232, 0x1301, iwl5100_agn_cfg)}, /* Half Mini Card */ |
3547 | {IWL_PCI_DEVICE(0x4232, 0x1306, iwl5100_abg_cfg)}, | 3547 | {IWL_PCI_DEVICE(0x4232, 0x1204, iwl5100_agn_cfg)}, /* Mini Card */ |
3548 | {IWL_PCI_DEVICE(0x4232, 0x1326, iwl5100_abg_cfg)}, | 3548 | {IWL_PCI_DEVICE(0x4232, 0x1304, iwl5100_agn_cfg)}, /* Half Mini Card */ |
3549 | {IWL_PCI_DEVICE(0x4237, 0x1216, iwl5100_abg_cfg)}, | 3549 | {IWL_PCI_DEVICE(0x4232, 0x1205, iwl5100_bgn_cfg)}, /* Mini Card */ |
3550 | {IWL_PCI_DEVICE(0x4232, PCI_ANY_ID, iwl5100_agn_cfg)}, | 3550 | {IWL_PCI_DEVICE(0x4232, 0x1305, iwl5100_bgn_cfg)}, /* Half Mini Card */ |
3551 | {IWL_PCI_DEVICE(0x4235, PCI_ANY_ID, iwl5300_agn_cfg)}, | 3551 | {IWL_PCI_DEVICE(0x4232, 0x1206, iwl5100_abg_cfg)}, /* Mini Card */ |
3552 | {IWL_PCI_DEVICE(0x4236, PCI_ANY_ID, iwl5300_agn_cfg)}, | 3552 | {IWL_PCI_DEVICE(0x4232, 0x1306, iwl5100_abg_cfg)}, /* Half Mini Card */ |
3553 | {IWL_PCI_DEVICE(0x4237, PCI_ANY_ID, iwl5100_agn_cfg)}, | 3553 | {IWL_PCI_DEVICE(0x4232, 0x1221, iwl5100_agn_cfg)}, /* Mini Card */ |
3554 | /* 5350 WiFi/WiMax */ | 3554 | {IWL_PCI_DEVICE(0x4232, 0x1321, iwl5100_agn_cfg)}, /* Half Mini Card */ |
3555 | {IWL_PCI_DEVICE(0x423A, 0x1001, iwl5350_agn_cfg)}, | 3555 | {IWL_PCI_DEVICE(0x4232, 0x1224, iwl5100_agn_cfg)}, /* Mini Card */ |
3556 | {IWL_PCI_DEVICE(0x423A, 0x1021, iwl5350_agn_cfg)}, | 3556 | {IWL_PCI_DEVICE(0x4232, 0x1324, iwl5100_agn_cfg)}, /* Half Mini Card */ |
3557 | {IWL_PCI_DEVICE(0x423B, 0x1011, iwl5350_agn_cfg)}, | 3557 | {IWL_PCI_DEVICE(0x4232, 0x1225, iwl5100_bgn_cfg)}, /* Mini Card */ |
3558 | /* 5150 Wifi/WiMax */ | 3558 | {IWL_PCI_DEVICE(0x4232, 0x1325, iwl5100_bgn_cfg)}, /* Half Mini Card */ |
3559 | {IWL_PCI_DEVICE(0x423C, PCI_ANY_ID, iwl5150_agn_cfg)}, | 3559 | {IWL_PCI_DEVICE(0x4232, 0x1226, iwl5100_abg_cfg)}, /* Mini Card */ |
3560 | {IWL_PCI_DEVICE(0x423D, PCI_ANY_ID, iwl5150_agn_cfg)}, | 3560 | {IWL_PCI_DEVICE(0x4232, 0x1326, iwl5100_abg_cfg)}, /* Half Mini Card */ |
3561 | {IWL_PCI_DEVICE(0x4237, 0x1211, iwl5100_agn_cfg)}, /* Mini Card */ | ||
3562 | {IWL_PCI_DEVICE(0x4237, 0x1311, iwl5100_agn_cfg)}, /* Half Mini Card */ | ||
3563 | {IWL_PCI_DEVICE(0x4237, 0x1214, iwl5100_agn_cfg)}, /* Mini Card */ | ||
3564 | {IWL_PCI_DEVICE(0x4237, 0x1314, iwl5100_agn_cfg)}, /* Half Mini Card */ | ||
3565 | {IWL_PCI_DEVICE(0x4237, 0x1215, iwl5100_bgn_cfg)}, /* Mini Card */ | ||
3566 | {IWL_PCI_DEVICE(0x4237, 0x1315, iwl5100_bgn_cfg)}, /* Half Mini Card */ | ||
3567 | {IWL_PCI_DEVICE(0x4237, 0x1216, iwl5100_abg_cfg)}, /* Mini Card */ | ||
3568 | {IWL_PCI_DEVICE(0x4237, 0x1316, iwl5100_abg_cfg)}, /* Half Mini Card */ | ||
3569 | |||
3570 | /* 5300 Series WiFi */ | ||
3571 | {IWL_PCI_DEVICE(0x4235, 0x1021, iwl5300_agn_cfg)}, /* Mini Card */ | ||
3572 | {IWL_PCI_DEVICE(0x4235, 0x1121, iwl5300_agn_cfg)}, /* Half Mini Card */ | ||
3573 | {IWL_PCI_DEVICE(0x4235, 0x1024, iwl5300_agn_cfg)}, /* Mini Card */ | ||
3574 | {IWL_PCI_DEVICE(0x4235, 0x1124, iwl5300_agn_cfg)}, /* Half Mini Card */ | ||
3575 | {IWL_PCI_DEVICE(0x4235, 0x1001, iwl5300_agn_cfg)}, /* Mini Card */ | ||
3576 | {IWL_PCI_DEVICE(0x4235, 0x1101, iwl5300_agn_cfg)}, /* Half Mini Card */ | ||
3577 | {IWL_PCI_DEVICE(0x4235, 0x1004, iwl5300_agn_cfg)}, /* Mini Card */ | ||
3578 | {IWL_PCI_DEVICE(0x4235, 0x1104, iwl5300_agn_cfg)}, /* Half Mini Card */ | ||
3579 | {IWL_PCI_DEVICE(0x4236, 0x1011, iwl5300_agn_cfg)}, /* Mini Card */ | ||
3580 | {IWL_PCI_DEVICE(0x4236, 0x1111, iwl5300_agn_cfg)}, /* Half Mini Card */ | ||
3581 | {IWL_PCI_DEVICE(0x4236, 0x1014, iwl5300_agn_cfg)}, /* Mini Card */ | ||
3582 | {IWL_PCI_DEVICE(0x4236, 0x1114, iwl5300_agn_cfg)}, /* Half Mini Card */ | ||
3583 | |||
3584 | /* 5350 Series WiFi/WiMax */ | ||
3585 | {IWL_PCI_DEVICE(0x423A, 0x1001, iwl5350_agn_cfg)}, /* Mini Card */ | ||
3586 | {IWL_PCI_DEVICE(0x423A, 0x1021, iwl5350_agn_cfg)}, /* Mini Card */ | ||
3587 | {IWL_PCI_DEVICE(0x423B, 0x1011, iwl5350_agn_cfg)}, /* Mini Card */ | ||
3588 | |||
3589 | /* 5150 Series Wifi/WiMax */ | ||
3590 | {IWL_PCI_DEVICE(0x423C, 0x1201, iwl5150_agn_cfg)}, /* Mini Card */ | ||
3591 | {IWL_PCI_DEVICE(0x423C, 0x1301, iwl5150_agn_cfg)}, /* Half Mini Card */ | ||
3592 | {IWL_PCI_DEVICE(0x423C, 0x1206, iwl5150_abg_cfg)}, /* Mini Card */ | ||
3593 | {IWL_PCI_DEVICE(0x423C, 0x1306, iwl5150_abg_cfg)}, /* Half Mini Card */ | ||
3594 | {IWL_PCI_DEVICE(0x423C, 0x1221, iwl5150_agn_cfg)}, /* Mini Card */ | ||
3595 | {IWL_PCI_DEVICE(0x423C, 0x1321, iwl5150_agn_cfg)}, /* Half Mini Card */ | ||
3596 | |||
3597 | {IWL_PCI_DEVICE(0x423D, 0x1211, iwl5150_agn_cfg)}, /* Mini Card */ | ||
3598 | {IWL_PCI_DEVICE(0x423D, 0x1311, iwl5150_agn_cfg)}, /* Half Mini Card */ | ||
3599 | {IWL_PCI_DEVICE(0x423D, 0x1216, iwl5150_abg_cfg)}, /* Mini Card */ | ||
3600 | {IWL_PCI_DEVICE(0x423D, 0x1316, iwl5150_abg_cfg)}, /* Half Mini Card */ | ||
3561 | 3601 | ||
3562 | /* 6x00 Series */ | 3602 | /* 6x00 Series */ |
3563 | {IWL_PCI_DEVICE(0x422B, 0x1101, iwl6000_3agn_cfg)}, | 3603 | {IWL_PCI_DEVICE(0x422B, 0x1101, iwl6000_3agn_cfg)}, |
diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h index 4ded1900540d..2673e9a4db92 100644 --- a/drivers/net/wireless/iwlwifi/iwl-dev.h +++ b/drivers/net/wireless/iwlwifi/iwl-dev.h | |||
@@ -52,9 +52,10 @@ extern struct iwl_cfg iwl4965_agn_cfg; | |||
52 | extern struct iwl_cfg iwl5300_agn_cfg; | 52 | extern struct iwl_cfg iwl5300_agn_cfg; |
53 | extern struct iwl_cfg iwl5100_agn_cfg; | 53 | extern struct iwl_cfg iwl5100_agn_cfg; |
54 | extern struct iwl_cfg iwl5350_agn_cfg; | 54 | extern struct iwl_cfg iwl5350_agn_cfg; |
55 | extern struct iwl_cfg iwl5100_bg_cfg; | 55 | extern struct iwl_cfg iwl5100_bgn_cfg; |
56 | extern struct iwl_cfg iwl5100_abg_cfg; | 56 | extern struct iwl_cfg iwl5100_abg_cfg; |
57 | extern struct iwl_cfg iwl5150_agn_cfg; | 57 | extern struct iwl_cfg iwl5150_agn_cfg; |
58 | extern struct iwl_cfg iwl5150_abg_cfg; | ||
58 | extern struct iwl_cfg iwl6000i_2agn_cfg; | 59 | extern struct iwl_cfg iwl6000i_2agn_cfg; |
59 | extern struct iwl_cfg iwl6000i_2abg_cfg; | 60 | extern struct iwl_cfg iwl6000i_2abg_cfg; |
60 | extern struct iwl_cfg iwl6000i_2bg_cfg; | 61 | extern struct iwl_cfg iwl6000i_2bg_cfg; |