diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-6000.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-6000.c | 46 |
1 files changed, 17 insertions, 29 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-6000.c b/drivers/net/wireless/iwlwifi/iwl-6000.c index a745b01c0ec..24d105b29ae 100644 --- a/drivers/net/wireless/iwlwifi/iwl-6000.c +++ b/drivers/net/wireless/iwlwifi/iwl-6000.c | |||
@@ -1,6 +1,6 @@ | |||
1 | /****************************************************************************** | 1 | /****************************************************************************** |
2 | * | 2 | * |
3 | * Copyright(c) 2008 - 2010 Intel Corporation. All rights reserved. | 3 | * Copyright(c) 2008 - 2011 Intel Corporation. All rights reserved. |
4 | * | 4 | * |
5 | * This program is free software; you can redistribute it and/or modify it | 5 | * This program is free software; you can redistribute it and/or modify it |
6 | * under the terms of version 2 of the GNU General Public License as | 6 | * under the terms of version 2 of the GNU General Public License as |
@@ -176,7 +176,6 @@ static int iwl6000_hw_set_hw_params(struct iwl_priv *priv) | |||
176 | priv->hw_params.max_data_size = IWL60_RTC_DATA_SIZE; | 176 | priv->hw_params.max_data_size = IWL60_RTC_DATA_SIZE; |
177 | priv->hw_params.max_inst_size = IWL60_RTC_INST_SIZE; | 177 | priv->hw_params.max_inst_size = IWL60_RTC_INST_SIZE; |
178 | 178 | ||
179 | priv->hw_params.max_bsm_size = 0; | ||
180 | priv->hw_params.ht40_channel = BIT(IEEE80211_BAND_2GHZ) | | 179 | priv->hw_params.ht40_channel = BIT(IEEE80211_BAND_2GHZ) | |
181 | BIT(IEEE80211_BAND_5GHZ); | 180 | BIT(IEEE80211_BAND_5GHZ); |
182 | priv->hw_params.rx_wrt_ptr_reg = FH_RSCSR_CHNL0_WPTR; | 181 | priv->hw_params.rx_wrt_ptr_reg = FH_RSCSR_CHNL0_WPTR; |
@@ -288,21 +287,16 @@ static struct iwl_lib_ops iwl6000_lib = { | |||
288 | .txq_update_byte_cnt_tbl = iwlagn_txq_update_byte_cnt_tbl, | 287 | .txq_update_byte_cnt_tbl = iwlagn_txq_update_byte_cnt_tbl, |
289 | .txq_inval_byte_cnt_tbl = iwlagn_txq_inval_byte_cnt_tbl, | 288 | .txq_inval_byte_cnt_tbl = iwlagn_txq_inval_byte_cnt_tbl, |
290 | .txq_set_sched = iwlagn_txq_set_sched, | 289 | .txq_set_sched = iwlagn_txq_set_sched, |
291 | .txq_agg_enable = iwlagn_txq_agg_enable, | ||
292 | .txq_agg_disable = iwlagn_txq_agg_disable, | ||
293 | .txq_attach_buf_to_tfd = iwl_hw_txq_attach_buf_to_tfd, | 290 | .txq_attach_buf_to_tfd = iwl_hw_txq_attach_buf_to_tfd, |
294 | .txq_free_tfd = iwl_hw_txq_free_tfd, | 291 | .txq_free_tfd = iwl_hw_txq_free_tfd, |
295 | .txq_init = iwl_hw_tx_queue_init, | 292 | .txq_init = iwl_hw_tx_queue_init, |
296 | .rx_handler_setup = iwlagn_rx_handler_setup, | 293 | .rx_handler_setup = iwlagn_rx_handler_setup, |
297 | .setup_deferred_work = iwlagn_setup_deferred_work, | 294 | .setup_deferred_work = iwlagn_setup_deferred_work, |
298 | .is_valid_rtc_data_addr = iwlagn_hw_valid_rtc_data_addr, | 295 | .is_valid_rtc_data_addr = iwlagn_hw_valid_rtc_data_addr, |
299 | .load_ucode = iwlagn_load_ucode, | ||
300 | .dump_nic_event_log = iwl_dump_nic_event_log, | 296 | .dump_nic_event_log = iwl_dump_nic_event_log, |
301 | .dump_nic_error_log = iwl_dump_nic_error_log, | 297 | .dump_nic_error_log = iwl_dump_nic_error_log, |
302 | .dump_csr = iwl_dump_csr, | 298 | .dump_csr = iwl_dump_csr, |
303 | .dump_fh = iwl_dump_fh, | 299 | .dump_fh = iwl_dump_fh, |
304 | .init_alive_start = iwlagn_init_alive_start, | ||
305 | .alive_notify = iwlagn_alive_notify, | ||
306 | .send_tx_power = iwlagn_send_tx_power, | 300 | .send_tx_power = iwlagn_send_tx_power, |
307 | .update_chain_flags = iwl_update_chain_flags, | 301 | .update_chain_flags = iwl_update_chain_flags, |
308 | .set_channel_switch = iwl6000_hw_channel_switch, | 302 | .set_channel_switch = iwl6000_hw_channel_switch, |
@@ -326,13 +320,6 @@ static struct iwl_lib_ops iwl6000_lib = { | |||
326 | .query_addr = iwlagn_eeprom_query_addr, | 320 | .query_addr = iwlagn_eeprom_query_addr, |
327 | .update_enhanced_txpower = iwlcore_eeprom_enhanced_txpower, | 321 | .update_enhanced_txpower = iwlcore_eeprom_enhanced_txpower, |
328 | }, | 322 | }, |
329 | .isr_ops = { | ||
330 | .isr = iwl_isr_ict, | ||
331 | .free = iwl_free_isr_ict, | ||
332 | .alloc = iwl_alloc_isr_ict, | ||
333 | .reset = iwl_reset_ict, | ||
334 | .disable = iwl_disable_ict, | ||
335 | }, | ||
336 | .temp_ops = { | 323 | .temp_ops = { |
337 | .temperature = iwlagn_temperature, | 324 | .temperature = iwlagn_temperature, |
338 | }, | 325 | }, |
@@ -357,8 +344,6 @@ static struct iwl_lib_ops iwl6030_lib = { | |||
357 | .txq_update_byte_cnt_tbl = iwlagn_txq_update_byte_cnt_tbl, | 344 | .txq_update_byte_cnt_tbl = iwlagn_txq_update_byte_cnt_tbl, |
358 | .txq_inval_byte_cnt_tbl = iwlagn_txq_inval_byte_cnt_tbl, | 345 | .txq_inval_byte_cnt_tbl = iwlagn_txq_inval_byte_cnt_tbl, |
359 | .txq_set_sched = iwlagn_txq_set_sched, | 346 | .txq_set_sched = iwlagn_txq_set_sched, |
360 | .txq_agg_enable = iwlagn_txq_agg_enable, | ||
361 | .txq_agg_disable = iwlagn_txq_agg_disable, | ||
362 | .txq_attach_buf_to_tfd = iwl_hw_txq_attach_buf_to_tfd, | 347 | .txq_attach_buf_to_tfd = iwl_hw_txq_attach_buf_to_tfd, |
363 | .txq_free_tfd = iwl_hw_txq_free_tfd, | 348 | .txq_free_tfd = iwl_hw_txq_free_tfd, |
364 | .txq_init = iwl_hw_tx_queue_init, | 349 | .txq_init = iwl_hw_tx_queue_init, |
@@ -366,13 +351,10 @@ static struct iwl_lib_ops iwl6030_lib = { | |||
366 | .setup_deferred_work = iwlagn_bt_setup_deferred_work, | 351 | .setup_deferred_work = iwlagn_bt_setup_deferred_work, |
367 | .cancel_deferred_work = iwlagn_bt_cancel_deferred_work, | 352 | .cancel_deferred_work = iwlagn_bt_cancel_deferred_work, |
368 | .is_valid_rtc_data_addr = iwlagn_hw_valid_rtc_data_addr, | 353 | .is_valid_rtc_data_addr = iwlagn_hw_valid_rtc_data_addr, |
369 | .load_ucode = iwlagn_load_ucode, | ||
370 | .dump_nic_event_log = iwl_dump_nic_event_log, | 354 | .dump_nic_event_log = iwl_dump_nic_event_log, |
371 | .dump_nic_error_log = iwl_dump_nic_error_log, | 355 | .dump_nic_error_log = iwl_dump_nic_error_log, |
372 | .dump_csr = iwl_dump_csr, | 356 | .dump_csr = iwl_dump_csr, |
373 | .dump_fh = iwl_dump_fh, | 357 | .dump_fh = iwl_dump_fh, |
374 | .init_alive_start = iwlagn_init_alive_start, | ||
375 | .alive_notify = iwlagn_alive_notify, | ||
376 | .send_tx_power = iwlagn_send_tx_power, | 358 | .send_tx_power = iwlagn_send_tx_power, |
377 | .update_chain_flags = iwl_update_chain_flags, | 359 | .update_chain_flags = iwl_update_chain_flags, |
378 | .set_channel_switch = iwl6000_hw_channel_switch, | 360 | .set_channel_switch = iwl6000_hw_channel_switch, |
@@ -396,13 +378,6 @@ static struct iwl_lib_ops iwl6030_lib = { | |||
396 | .query_addr = iwlagn_eeprom_query_addr, | 378 | .query_addr = iwlagn_eeprom_query_addr, |
397 | .update_enhanced_txpower = iwlcore_eeprom_enhanced_txpower, | 379 | .update_enhanced_txpower = iwlcore_eeprom_enhanced_txpower, |
398 | }, | 380 | }, |
399 | .isr_ops = { | ||
400 | .isr = iwl_isr_ict, | ||
401 | .free = iwl_free_isr_ict, | ||
402 | .alloc = iwl_alloc_isr_ict, | ||
403 | .reset = iwl_reset_ict, | ||
404 | .disable = iwl_disable_ict, | ||
405 | }, | ||
406 | .temp_ops = { | 381 | .temp_ops = { |
407 | .temperature = iwlagn_temperature, | 382 | .temperature = iwlagn_temperature, |
408 | }, | 383 | }, |
@@ -470,7 +445,6 @@ static struct iwl_base_params iwl6000_base_params = { | |||
470 | .num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES, | 445 | .num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES, |
471 | .pll_cfg_val = 0, | 446 | .pll_cfg_val = 0, |
472 | .set_l0s = true, | 447 | .set_l0s = true, |
473 | .use_bsm = false, | ||
474 | .max_ll_items = OTP_MAX_LL_ITEMS_6x00, | 448 | .max_ll_items = OTP_MAX_LL_ITEMS_6x00, |
475 | .shadow_ram_support = true, | 449 | .shadow_ram_support = true, |
476 | .led_compensation = 51, | 450 | .led_compensation = 51, |
@@ -493,7 +467,6 @@ static struct iwl_base_params iwl6050_base_params = { | |||
493 | .num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES, | 467 | .num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES, |
494 | .pll_cfg_val = 0, | 468 | .pll_cfg_val = 0, |
495 | .set_l0s = true, | 469 | .set_l0s = true, |
496 | .use_bsm = false, | ||
497 | .max_ll_items = OTP_MAX_LL_ITEMS_6x50, | 470 | .max_ll_items = OTP_MAX_LL_ITEMS_6x50, |
498 | .shadow_ram_support = true, | 471 | .shadow_ram_support = true, |
499 | .led_compensation = 51, | 472 | .led_compensation = 51, |
@@ -515,7 +488,6 @@ static struct iwl_base_params iwl6000_g2_base_params = { | |||
515 | .num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES, | 488 | .num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES, |
516 | .pll_cfg_val = 0, | 489 | .pll_cfg_val = 0, |
517 | .set_l0s = true, | 490 | .set_l0s = true, |
518 | .use_bsm = false, | ||
519 | .max_ll_items = OTP_MAX_LL_ITEMS_6x00, | 491 | .max_ll_items = OTP_MAX_LL_ITEMS_6x00, |
520 | .shadow_ram_support = true, | 492 | .shadow_ram_support = true, |
521 | .led_compensation = 57, | 493 | .led_compensation = 57, |
@@ -613,6 +585,22 @@ struct iwl_cfg iwl6030_2bg_cfg = { | |||
613 | IWL_DEVICE_6030, | 585 | IWL_DEVICE_6030, |
614 | }; | 586 | }; |
615 | 587 | ||
588 | struct iwl_cfg iwl6035_2agn_cfg = { | ||
589 | .name = "6035 Series 2x2 AGN/BT", | ||
590 | IWL_DEVICE_6030, | ||
591 | .ht_params = &iwl6000_ht_params, | ||
592 | }; | ||
593 | |||
594 | struct iwl_cfg iwl6035_2abg_cfg = { | ||
595 | .name = "6035 Series 2x2 ABG/BT", | ||
596 | IWL_DEVICE_6030, | ||
597 | }; | ||
598 | |||
599 | struct iwl_cfg iwl6035_2bg_cfg = { | ||
600 | .name = "6035 Series 2x2 BG/BT", | ||
601 | IWL_DEVICE_6030, | ||
602 | }; | ||
603 | |||
616 | struct iwl_cfg iwl1030_bgn_cfg = { | 604 | struct iwl_cfg iwl1030_bgn_cfg = { |
617 | .name = "Intel(R) Centrino(R) Wireless-N 1030 BGN", | 605 | .name = "Intel(R) Centrino(R) Wireless-N 1030 BGN", |
618 | IWL_DEVICE_6030, | 606 | IWL_DEVICE_6030, |