diff options
author | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2011-01-08 13:25:14 -0500 |
---|---|---|
committer | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2011-01-21 18:28:40 -0500 |
commit | 1956e1ad6292d257219d0f98a53f0a78ef282070 (patch) | |
tree | 873d608dcb7c4109a8970ec13a83bfe002fdeb0b | |
parent | 5ed540aecc2aae92d5c97b9a9306a5bf88ad5574 (diff) |
iwlagn: remove reference to gen2a and gen2b
Since 6005, 6030 and 6150 series are offical released, remove the reference
to gen2x and use the product number instead.
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-6000.c | 52 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-eeprom.h | 16 |
2 files changed, 36 insertions, 32 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-6000.c b/drivers/net/wireless/iwlwifi/iwl-6000.c index af505bcd7ae0..c195674454f4 100644 --- a/drivers/net/wireless/iwlwifi/iwl-6000.c +++ b/drivers/net/wireless/iwlwifi/iwl-6000.c | |||
@@ -67,13 +67,13 @@ | |||
67 | #define _IWL6050_MODULE_FIRMWARE(api) IWL6050_FW_PRE #api ".ucode" | 67 | #define _IWL6050_MODULE_FIRMWARE(api) IWL6050_FW_PRE #api ".ucode" |
68 | #define IWL6050_MODULE_FIRMWARE(api) _IWL6050_MODULE_FIRMWARE(api) | 68 | #define IWL6050_MODULE_FIRMWARE(api) _IWL6050_MODULE_FIRMWARE(api) |
69 | 69 | ||
70 | #define IWL6000G2A_FW_PRE "iwlwifi-6000g2a-" | 70 | #define IWL6005_FW_PRE "iwlwifi-6000g2a-" |
71 | #define _IWL6000G2A_MODULE_FIRMWARE(api) IWL6000G2A_FW_PRE #api ".ucode" | 71 | #define _IWL6005_MODULE_FIRMWARE(api) IWL6005_FW_PRE #api ".ucode" |
72 | #define IWL6000G2A_MODULE_FIRMWARE(api) _IWL6000G2A_MODULE_FIRMWARE(api) | 72 | #define IWL6005_MODULE_FIRMWARE(api) _IWL6005_MODULE_FIRMWARE(api) |
73 | 73 | ||
74 | #define IWL6000G2B_FW_PRE "iwlwifi-6000g2b-" | 74 | #define IWL6030_FW_PRE "iwlwifi-6000g2b-" |
75 | #define _IWL6000G2B_MODULE_FIRMWARE(api) IWL6000G2B_FW_PRE #api ".ucode" | 75 | #define _IWL6030_MODULE_FIRMWARE(api) IWL6030_FW_PRE #api ".ucode" |
76 | #define IWL6000G2B_MODULE_FIRMWARE(api) _IWL6000G2B_MODULE_FIRMWARE(api) | 76 | #define IWL6030_MODULE_FIRMWARE(api) _IWL6030_MODULE_FIRMWARE(api) |
77 | 77 | ||
78 | static void iwl6000_set_ct_threshold(struct iwl_priv *priv) | 78 | static void iwl6000_set_ct_threshold(struct iwl_priv *priv) |
79 | { | 79 | { |
@@ -90,7 +90,7 @@ static void iwl6050_additional_nic_config(struct iwl_priv *priv) | |||
90 | CSR_GP_DRIVER_REG_BIT_CALIB_VERSION6); | 90 | CSR_GP_DRIVER_REG_BIT_CALIB_VERSION6); |
91 | } | 91 | } |
92 | 92 | ||
93 | static void iwl6050g2_additional_nic_config(struct iwl_priv *priv) | 93 | static void iwl6150_additional_nic_config(struct iwl_priv *priv) |
94 | { | 94 | { |
95 | /* Indicate calibration version to uCode. */ | 95 | /* Indicate calibration version to uCode. */ |
96 | if (priv->cfg->ops->lib->eeprom_ops.calib_version(priv) >= 6) | 96 | if (priv->cfg->ops->lib->eeprom_ops.calib_version(priv) >= 6) |
@@ -354,7 +354,7 @@ static struct iwl_lib_ops iwl6000_lib = { | |||
354 | } | 354 | } |
355 | }; | 355 | }; |
356 | 356 | ||
357 | static struct iwl_lib_ops iwl6000g2b_lib = { | 357 | static struct iwl_lib_ops iwl6030_lib = { |
358 | .set_hw_params = iwl6000_hw_set_hw_params, | 358 | .set_hw_params = iwl6000_hw_set_hw_params, |
359 | .txq_update_byte_cnt_tbl = iwlagn_txq_update_byte_cnt_tbl, | 359 | .txq_update_byte_cnt_tbl = iwlagn_txq_update_byte_cnt_tbl, |
360 | .txq_inval_byte_cnt_tbl = iwlagn_txq_inval_byte_cnt_tbl, | 360 | .txq_inval_byte_cnt_tbl = iwlagn_txq_inval_byte_cnt_tbl, |
@@ -430,8 +430,8 @@ static struct iwl_nic_ops iwl6050_nic_ops = { | |||
430 | .additional_nic_config = &iwl6050_additional_nic_config, | 430 | .additional_nic_config = &iwl6050_additional_nic_config, |
431 | }; | 431 | }; |
432 | 432 | ||
433 | static struct iwl_nic_ops iwl6050g2_nic_ops = { | 433 | static struct iwl_nic_ops iwl6150_nic_ops = { |
434 | .additional_nic_config = &iwl6050g2_additional_nic_config, | 434 | .additional_nic_config = &iwl6150_additional_nic_config, |
435 | }; | 435 | }; |
436 | 436 | ||
437 | static const struct iwl_ops iwl6000_ops = { | 437 | static const struct iwl_ops iwl6000_ops = { |
@@ -451,17 +451,17 @@ static const struct iwl_ops iwl6050_ops = { | |||
451 | .ieee80211_ops = &iwlagn_hw_ops, | 451 | .ieee80211_ops = &iwlagn_hw_ops, |
452 | }; | 452 | }; |
453 | 453 | ||
454 | static const struct iwl_ops iwl6050g2_ops = { | 454 | static const struct iwl_ops iwl6150_ops = { |
455 | .lib = &iwl6000_lib, | 455 | .lib = &iwl6000_lib, |
456 | .hcmd = &iwlagn_hcmd, | 456 | .hcmd = &iwlagn_hcmd, |
457 | .utils = &iwlagn_hcmd_utils, | 457 | .utils = &iwlagn_hcmd_utils, |
458 | .led = &iwlagn_led_ops, | 458 | .led = &iwlagn_led_ops, |
459 | .nic = &iwl6050g2_nic_ops, | 459 | .nic = &iwl6150_nic_ops, |
460 | .ieee80211_ops = &iwlagn_hw_ops, | 460 | .ieee80211_ops = &iwlagn_hw_ops, |
461 | }; | 461 | }; |
462 | 462 | ||
463 | static const struct iwl_ops iwl6000g2b_ops = { | 463 | static const struct iwl_ops iwl6030_ops = { |
464 | .lib = &iwl6000g2b_lib, | 464 | .lib = &iwl6030_lib, |
465 | .hcmd = &iwlagn_bt_hcmd, | 465 | .hcmd = &iwlagn_bt_hcmd, |
466 | .utils = &iwlagn_hcmd_utils, | 466 | .utils = &iwlagn_hcmd_utils, |
467 | .led = &iwlagn_led_ops, | 467 | .led = &iwlagn_led_ops, |
@@ -555,11 +555,11 @@ static struct iwl_bt_params iwl6000_bt_params = { | |||
555 | }; | 555 | }; |
556 | 556 | ||
557 | #define IWL_DEVICE_6005 \ | 557 | #define IWL_DEVICE_6005 \ |
558 | .fw_name_pre = IWL6000G2A_FW_PRE, \ | 558 | .fw_name_pre = IWL6005_FW_PRE, \ |
559 | .ucode_api_max = IWL6000G2_UCODE_API_MAX, \ | 559 | .ucode_api_max = IWL6000G2_UCODE_API_MAX, \ |
560 | .ucode_api_min = IWL6000G2_UCODE_API_MIN, \ | 560 | .ucode_api_min = IWL6000G2_UCODE_API_MIN, \ |
561 | .eeprom_ver = EEPROM_6000G2_EEPROM_VERSION, \ | 561 | .eeprom_ver = EEPROM_6005_EEPROM_VERSION, \ |
562 | .eeprom_calib_ver = EEPROM_6000G2_TX_POWER_VERSION, \ | 562 | .eeprom_calib_ver = EEPROM_6005_TX_POWER_VERSION, \ |
563 | .ops = &iwl6000_ops, \ | 563 | .ops = &iwl6000_ops, \ |
564 | .mod_params = &iwlagn_mod_params, \ | 564 | .mod_params = &iwlagn_mod_params, \ |
565 | .base_params = &iwl6000_g2_base_params, \ | 565 | .base_params = &iwl6000_g2_base_params, \ |
@@ -584,12 +584,12 @@ struct iwl_cfg iwl6005_2bg_cfg = { | |||
584 | }; | 584 | }; |
585 | 585 | ||
586 | #define IWL_DEVICE_6030 \ | 586 | #define IWL_DEVICE_6030 \ |
587 | .fw_name_pre = IWL6000G2B_FW_PRE, \ | 587 | .fw_name_pre = IWL6030_FW_PRE, \ |
588 | .ucode_api_max = IWL6000G2_UCODE_API_MAX, \ | 588 | .ucode_api_max = IWL6000G2_UCODE_API_MAX, \ |
589 | .ucode_api_min = IWL6000G2_UCODE_API_MIN, \ | 589 | .ucode_api_min = IWL6000G2_UCODE_API_MIN, \ |
590 | .eeprom_ver = EEPROM_6000G2_EEPROM_VERSION, \ | 590 | .eeprom_ver = EEPROM_6030_EEPROM_VERSION, \ |
591 | .eeprom_calib_ver = EEPROM_6000G2_TX_POWER_VERSION, \ | 591 | .eeprom_calib_ver = EEPROM_6030_TX_POWER_VERSION, \ |
592 | .ops = &iwl6000g2b_ops, \ | 592 | .ops = &iwl6030_ops, \ |
593 | .mod_params = &iwlagn_mod_params, \ | 593 | .mod_params = &iwlagn_mod_params, \ |
594 | .base_params = &iwl6000_g2_base_params, \ | 594 | .base_params = &iwl6000_g2_base_params, \ |
595 | .bt_params = &iwl6000_bt_params, \ | 595 | .bt_params = &iwl6000_bt_params, \ |
@@ -706,9 +706,9 @@ struct iwl_cfg iwl6150_bgn_cfg = { | |||
706 | .fw_name_pre = IWL6050_FW_PRE, | 706 | .fw_name_pre = IWL6050_FW_PRE, |
707 | .ucode_api_max = IWL6050_UCODE_API_MAX, | 707 | .ucode_api_max = IWL6050_UCODE_API_MAX, |
708 | .ucode_api_min = IWL6050_UCODE_API_MIN, | 708 | .ucode_api_min = IWL6050_UCODE_API_MIN, |
709 | .eeprom_ver = EEPROM_6050G2_EEPROM_VERSION, | 709 | .eeprom_ver = EEPROM_6150_EEPROM_VERSION, |
710 | .eeprom_calib_ver = EEPROM_6050G2_TX_POWER_VERSION, | 710 | .eeprom_calib_ver = EEPROM_6150_TX_POWER_VERSION, |
711 | .ops = &iwl6050g2_ops, | 711 | .ops = &iwl6150_ops, |
712 | .mod_params = &iwlagn_mod_params, | 712 | .mod_params = &iwlagn_mod_params, |
713 | .base_params = &iwl6050_base_params, | 713 | .base_params = &iwl6050_base_params, |
714 | .ht_params = &iwl6000_ht_params, | 714 | .ht_params = &iwl6000_ht_params, |
@@ -734,5 +734,5 @@ struct iwl_cfg iwl6000_3agn_cfg = { | |||
734 | 734 | ||
735 | MODULE_FIRMWARE(IWL6000_MODULE_FIRMWARE(IWL6000_UCODE_API_MAX)); | 735 | MODULE_FIRMWARE(IWL6000_MODULE_FIRMWARE(IWL6000_UCODE_API_MAX)); |
736 | MODULE_FIRMWARE(IWL6050_MODULE_FIRMWARE(IWL6050_UCODE_API_MAX)); | 736 | MODULE_FIRMWARE(IWL6050_MODULE_FIRMWARE(IWL6050_UCODE_API_MAX)); |
737 | MODULE_FIRMWARE(IWL6000G2A_MODULE_FIRMWARE(IWL6000G2_UCODE_API_MAX)); | 737 | MODULE_FIRMWARE(IWL6005_MODULE_FIRMWARE(IWL6000G2_UCODE_API_MAX)); |
738 | MODULE_FIRMWARE(IWL6000G2B_MODULE_FIRMWARE(IWL6000G2_UCODE_API_MAX)); | 738 | MODULE_FIRMWARE(IWL6030_MODULE_FIRMWARE(IWL6000G2_UCODE_API_MAX)); |
diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom.h b/drivers/net/wireless/iwlwifi/iwl-eeprom.h index 9e6f31355eee..4f4cd4fddbf1 100644 --- a/drivers/net/wireless/iwlwifi/iwl-eeprom.h +++ b/drivers/net/wireless/iwlwifi/iwl-eeprom.h | |||
@@ -247,13 +247,17 @@ struct iwl_eeprom_enhanced_txpwr { | |||
247 | #define EEPROM_6050_TX_POWER_VERSION (4) | 247 | #define EEPROM_6050_TX_POWER_VERSION (4) |
248 | #define EEPROM_6050_EEPROM_VERSION (0x532) | 248 | #define EEPROM_6050_EEPROM_VERSION (0x532) |
249 | 249 | ||
250 | /* 6x50g2 Specific */ | 250 | /* 6150 Specific */ |
251 | #define EEPROM_6050G2_TX_POWER_VERSION (6) | 251 | #define EEPROM_6150_TX_POWER_VERSION (6) |
252 | #define EEPROM_6050G2_EEPROM_VERSION (0x553) | 252 | #define EEPROM_6150_EEPROM_VERSION (0x553) |
253 | 253 | ||
254 | /* 6x00g2 Specific */ | 254 | /* 6x05 Specific */ |
255 | #define EEPROM_6000G2_TX_POWER_VERSION (6) | 255 | #define EEPROM_6005_TX_POWER_VERSION (6) |
256 | #define EEPROM_6000G2_EEPROM_VERSION (0x709) | 256 | #define EEPROM_6005_EEPROM_VERSION (0x709) |
257 | |||
258 | /* 6x30 Specific */ | ||
259 | #define EEPROM_6030_TX_POWER_VERSION (6) | ||
260 | #define EEPROM_6030_EEPROM_VERSION (0x709) | ||
257 | 261 | ||
258 | /* OTP */ | 262 | /* OTP */ |
259 | /* lower blocks contain EEPROM image and calibration data */ | 263 | /* lower blocks contain EEPROM image and calibration data */ |