diff options
author | Jay Sternberg <jay.e.sternberg@intel.com> | 2010-03-17 19:16:12 -0400 |
---|---|---|
committer | Reinette Chatre <reinette.chatre@intel.com> | 2010-03-25 14:20:05 -0400 |
commit | 0b5af201b25334f7b9c991b2800693dd4cb4b5f7 (patch) | |
tree | 9f2a316cf23c7e011140653ee5fc695937f144aa /drivers/net/wireless/iwlwifi/iwl-6000.c | |
parent | 8d801080dd8d28bf7d85cacba131f18b7653ee49 (diff) |
iwlwifi: enable '6000 Series 2x2 AGN Gen2' adaptors
Signed-off-by: Jay Sternberg <jay.e.sternberg@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-6000.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-6000.c | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-6000.c b/drivers/net/wireless/iwlwifi/iwl-6000.c index f89e1c794388..7473518e7e0a 100644 --- a/drivers/net/wireless/iwlwifi/iwl-6000.c +++ b/drivers/net/wireless/iwlwifi/iwl-6000.c | |||
@@ -57,6 +57,7 @@ | |||
57 | #define IWL6050_UCODE_API_MIN 4 | 57 | #define IWL6050_UCODE_API_MIN 4 |
58 | 58 | ||
59 | #define IWL6000_FW_PRE "iwlwifi-6000-" | 59 | #define IWL6000_FW_PRE "iwlwifi-6000-" |
60 | #define IWL6000_G2_FW_PRE "iwlwifi-6005-" | ||
60 | #define _IWL6000_MODULE_FIRMWARE(api) IWL6000_FW_PRE #api ".ucode" | 61 | #define _IWL6000_MODULE_FIRMWARE(api) IWL6000_FW_PRE #api ".ucode" |
61 | #define IWL6000_MODULE_FIRMWARE(api) _IWL6000_MODULE_FIRMWARE(api) | 62 | #define IWL6000_MODULE_FIRMWARE(api) _IWL6000_MODULE_FIRMWARE(api) |
62 | 63 | ||
@@ -362,6 +363,39 @@ static const struct iwl_ops iwl6050_ops = { | |||
362 | /* | 363 | /* |
363 | * "i": Internal configuration, use internal Power Amplifier | 364 | * "i": Internal configuration, use internal Power Amplifier |
364 | */ | 365 | */ |
366 | struct iwl_cfg iwl6000i_g2_2agn_cfg = { | ||
367 | .name = "6000 Series 2x2 AGN Gen2", | ||
368 | .fw_name_pre = IWL6000_G2_FW_PRE, | ||
369 | .ucode_api_max = IWL6000_UCODE_API_MAX, | ||
370 | .ucode_api_min = IWL6000_UCODE_API_MIN, | ||
371 | .sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N, | ||
372 | .ops = &iwl6000_ops, | ||
373 | .eeprom_size = OTP_LOW_IMAGE_SIZE, | ||
374 | .eeprom_ver = EEPROM_6000_EEPROM_VERSION, | ||
375 | .eeprom_calib_ver = EEPROM_6000_TX_POWER_VERSION, | ||
376 | .num_of_queues = IWLAGN_NUM_QUEUES, | ||
377 | .num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES, | ||
378 | .mod_params = &iwlagn_mod_params, | ||
379 | .valid_tx_ant = ANT_AB, | ||
380 | .valid_rx_ant = ANT_AB, | ||
381 | .pll_cfg_val = 0, | ||
382 | .set_l0s = true, | ||
383 | .use_bsm = false, | ||
384 | .pa_type = IWL_PA_INTERNAL, | ||
385 | .max_ll_items = OTP_MAX_LL_ITEMS_6x00, | ||
386 | .shadow_ram_support = true, | ||
387 | .ht_greenfield_support = true, | ||
388 | .led_compensation = 51, | ||
389 | .use_rts_for_ht = true, /* use rts/cts protection */ | ||
390 | .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS, | ||
391 | .supports_idle = true, | ||
392 | .adv_thermal_throttle = true, | ||
393 | .support_ct_kill_exit = true, | ||
394 | .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF, | ||
395 | .chain_noise_scale = 1000, | ||
396 | .monitor_recover_period = IWL_MONITORING_PERIOD, | ||
397 | }; | ||
398 | |||
365 | struct iwl_cfg iwl6000i_2agn_cfg = { | 399 | struct iwl_cfg iwl6000i_2agn_cfg = { |
366 | .name = "Intel(R) Centrino(R) Advanced-N 6200 AGN", | 400 | .name = "Intel(R) Centrino(R) Advanced-N 6200 AGN", |
367 | .fw_name_pre = IWL6000_FW_PRE, | 401 | .fw_name_pre = IWL6000_FW_PRE, |