diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-6000.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-6000.c | 338 |
1 files changed, 101 insertions, 237 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-6000.c b/drivers/net/wireless/iwlwifi/iwl-6000.c index a848ca06dc6f..f4bec3201ef9 100644 --- a/drivers/net/wireless/iwlwifi/iwl-6000.c +++ b/drivers/net/wireless/iwlwifi/iwl-6000.c | |||
@@ -182,7 +182,11 @@ static int iwl6000_hw_set_hw_params(struct iwl_priv *priv) | |||
182 | priv->hw_params.rx_wrt_ptr_reg = FH_RSCSR_CHNL0_WPTR; | 182 | priv->hw_params.rx_wrt_ptr_reg = FH_RSCSR_CHNL0_WPTR; |
183 | 183 | ||
184 | priv->hw_params.tx_chains_num = num_of_ant(priv->cfg->valid_tx_ant); | 184 | priv->hw_params.tx_chains_num = num_of_ant(priv->cfg->valid_tx_ant); |
185 | priv->hw_params.rx_chains_num = num_of_ant(priv->cfg->valid_rx_ant); | 185 | if (priv->cfg->rx_with_siso_diversity) |
186 | priv->hw_params.rx_chains_num = 1; | ||
187 | else | ||
188 | priv->hw_params.rx_chains_num = | ||
189 | num_of_ant(priv->cfg->valid_rx_ant); | ||
186 | priv->hw_params.valid_tx_ant = priv->cfg->valid_tx_ant; | 190 | priv->hw_params.valid_tx_ant = priv->cfg->valid_tx_ant; |
187 | priv->hw_params.valid_rx_ant = priv->cfg->valid_rx_ant; | 191 | priv->hw_params.valid_rx_ant = priv->cfg->valid_rx_ant; |
188 | 192 | ||
@@ -511,7 +515,7 @@ static struct iwl_base_params iwl6050_base_params = { | |||
511 | .chain_noise_calib_by_driver = true, | 515 | .chain_noise_calib_by_driver = true, |
512 | .shadow_reg_enable = true, | 516 | .shadow_reg_enable = true, |
513 | }; | 517 | }; |
514 | static struct iwl_base_params iwl6000_coex_base_params = { | 518 | static struct iwl_base_params iwl6000_g2_base_params = { |
515 | .eeprom_size = OTP_LOW_IMAGE_SIZE, | 519 | .eeprom_size = OTP_LOW_IMAGE_SIZE, |
516 | .num_of_queues = IWLAGN_NUM_QUEUES, | 520 | .num_of_queues = IWLAGN_NUM_QUEUES, |
517 | .num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES, | 521 | .num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES, |
@@ -520,7 +524,7 @@ static struct iwl_base_params iwl6000_coex_base_params = { | |||
520 | .use_bsm = false, | 524 | .use_bsm = false, |
521 | .max_ll_items = OTP_MAX_LL_ITEMS_6x00, | 525 | .max_ll_items = OTP_MAX_LL_ITEMS_6x00, |
522 | .shadow_ram_support = true, | 526 | .shadow_ram_support = true, |
523 | .led_compensation = 51, | 527 | .led_compensation = 57, |
524 | .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS, | 528 | .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS, |
525 | .supports_idle = true, | 529 | .supports_idle = true, |
526 | .adv_thermal_throttle = true, | 530 | .adv_thermal_throttle = true, |
@@ -550,243 +554,156 @@ static struct iwl_bt_params iwl6000_bt_params = { | |||
550 | .bt_sco_disable = true, | 554 | .bt_sco_disable = true, |
551 | }; | 555 | }; |
552 | 556 | ||
557 | #define IWL_DEVICE_6005 \ | ||
558 | .fw_name_pre = IWL6000G2A_FW_PRE, \ | ||
559 | .ucode_api_max = IWL6000G2_UCODE_API_MAX, \ | ||
560 | .ucode_api_min = IWL6000G2_UCODE_API_MIN, \ | ||
561 | .eeprom_ver = EEPROM_6000G2_EEPROM_VERSION, \ | ||
562 | .eeprom_calib_ver = EEPROM_6000G2_TX_POWER_VERSION, \ | ||
563 | .ops = &iwl6000_ops, \ | ||
564 | .mod_params = &iwlagn_mod_params, \ | ||
565 | .base_params = &iwl6000_g2_base_params, \ | ||
566 | .need_dc_calib = true, \ | ||
567 | .need_temp_offset_calib = true, \ | ||
568 | .led_mode = IWL_LED_RF_STATE | ||
569 | |||
553 | struct iwl_cfg iwl6005_2agn_cfg = { | 570 | struct iwl_cfg iwl6005_2agn_cfg = { |
554 | .name = "Intel(R) Centrino(R) Advanced-N 6205 AGN", | 571 | .name = "Intel(R) Centrino(R) Advanced-N 6205 AGN", |
555 | .fw_name_pre = IWL6000G2A_FW_PRE, | 572 | IWL_DEVICE_6005, |
556 | .ucode_api_max = IWL6000G2_UCODE_API_MAX, | ||
557 | .ucode_api_min = IWL6000G2_UCODE_API_MIN, | ||
558 | .eeprom_ver = EEPROM_6000G2_EEPROM_VERSION, | ||
559 | .eeprom_calib_ver = EEPROM_6000G2_TX_POWER_VERSION, | ||
560 | .ops = &iwl6000_ops, | ||
561 | .mod_params = &iwlagn_mod_params, | ||
562 | .base_params = &iwl6000_base_params, | ||
563 | .ht_params = &iwl6000_ht_params, | 573 | .ht_params = &iwl6000_ht_params, |
564 | .need_dc_calib = true, | ||
565 | .need_temp_offset_calib = true, | ||
566 | .led_mode = IWL_LED_RF_STATE, | ||
567 | .use_new_eeprom_reading = true, | ||
568 | }; | 574 | }; |
569 | 575 | ||
570 | struct iwl_cfg iwl6005_2abg_cfg = { | 576 | struct iwl_cfg iwl6005_2abg_cfg = { |
571 | .name = "Intel(R) Centrino(R) Advanced-N 6205 ABG", | 577 | .name = "Intel(R) Centrino(R) Advanced-N 6205 ABG", |
572 | .fw_name_pre = IWL6000G2A_FW_PRE, | 578 | IWL_DEVICE_6005, |
573 | .ucode_api_max = IWL6000G2_UCODE_API_MAX, | ||
574 | .ucode_api_min = IWL6000G2_UCODE_API_MIN, | ||
575 | .eeprom_ver = EEPROM_6000G2_EEPROM_VERSION, | ||
576 | .eeprom_calib_ver = EEPROM_6000G2_TX_POWER_VERSION, | ||
577 | .ops = &iwl6000_ops, | ||
578 | .mod_params = &iwlagn_mod_params, | ||
579 | .base_params = &iwl6000_base_params, | ||
580 | .need_dc_calib = true, | ||
581 | .need_temp_offset_calib = true, | ||
582 | .led_mode = IWL_LED_RF_STATE, | ||
583 | .use_new_eeprom_reading = true, | ||
584 | }; | 579 | }; |
585 | 580 | ||
586 | struct iwl_cfg iwl6005_2bg_cfg = { | 581 | struct iwl_cfg iwl6005_2bg_cfg = { |
587 | .name = "Intel(R) Centrino(R) Advanced-N 6205 BG", | 582 | .name = "Intel(R) Centrino(R) Advanced-N 6205 BG", |
588 | .fw_name_pre = IWL6000G2A_FW_PRE, | 583 | IWL_DEVICE_6005, |
589 | .ucode_api_max = IWL6000G2_UCODE_API_MAX, | 584 | }; |
590 | .ucode_api_min = IWL6000G2_UCODE_API_MIN, | 585 | |
591 | .eeprom_ver = EEPROM_6000G2_EEPROM_VERSION, | 586 | #define IWL_DEVICE_6030 \ |
592 | .eeprom_calib_ver = EEPROM_6000G2_TX_POWER_VERSION, | 587 | .fw_name_pre = IWL6000G2B_FW_PRE, \ |
593 | .ops = &iwl6000_ops, | 588 | .ucode_api_max = IWL6000G2_UCODE_API_MAX, \ |
594 | .mod_params = &iwlagn_mod_params, | 589 | .ucode_api_min = IWL6000G2_UCODE_API_MIN, \ |
595 | .base_params = &iwl6000_base_params, | 590 | .eeprom_ver = EEPROM_6000G2_EEPROM_VERSION, \ |
596 | .need_dc_calib = true, | 591 | .eeprom_calib_ver = EEPROM_6000G2_TX_POWER_VERSION, \ |
597 | .need_temp_offset_calib = true, | 592 | .ops = &iwl6000g2b_ops, \ |
598 | .led_mode = IWL_LED_RF_STATE, | 593 | .mod_params = &iwlagn_mod_params, \ |
599 | .use_new_eeprom_reading = true, | 594 | .base_params = &iwl6000_g2_base_params, \ |
600 | }; | 595 | .bt_params = &iwl6000_bt_params, \ |
596 | .need_dc_calib = true, \ | ||
597 | .need_temp_offset_calib = true, \ | ||
598 | .led_mode = IWL_LED_RF_STATE, \ | ||
599 | .adv_pm = true, \ | ||
600 | /* \ | ||
601 | *Due to bluetooth, we transmit 2.4 GHz probes \ | ||
602 | * only on antenna A \ | ||
603 | */ \ | ||
604 | .scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A | ||
601 | 605 | ||
602 | struct iwl_cfg iwl6030_2agn_cfg = { | 606 | struct iwl_cfg iwl6030_2agn_cfg = { |
603 | .name = "Intel(R) Centrino(R) Advanced-N 6230 AGN", | 607 | .name = "Intel(R) Centrino(R) Advanced-N 6230 AGN", |
604 | .fw_name_pre = IWL6000G2B_FW_PRE, | 608 | IWL_DEVICE_6030, |
605 | .ucode_api_max = IWL6000G2_UCODE_API_MAX, | ||
606 | .ucode_api_min = IWL6000G2_UCODE_API_MIN, | ||
607 | .eeprom_ver = EEPROM_6000G2_EEPROM_VERSION, | ||
608 | .eeprom_calib_ver = EEPROM_6000G2_TX_POWER_VERSION, | ||
609 | .ops = &iwl6000g2b_ops, | ||
610 | .mod_params = &iwlagn_mod_params, | ||
611 | .base_params = &iwl6000_coex_base_params, | ||
612 | .bt_params = &iwl6000_bt_params, | ||
613 | .ht_params = &iwl6000_ht_params, | 609 | .ht_params = &iwl6000_ht_params, |
614 | .need_dc_calib = true, | ||
615 | .need_temp_offset_calib = true, | ||
616 | .led_mode = IWL_LED_RF_STATE, | ||
617 | .adv_pm = true, | ||
618 | /* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */ | ||
619 | .scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A, | ||
620 | .use_new_eeprom_reading = true, | ||
621 | }; | 610 | }; |
622 | 611 | ||
623 | struct iwl_cfg iwl6030_2abg_cfg = { | 612 | struct iwl_cfg iwl6030_2abg_cfg = { |
624 | .name = "Intel(R) Centrino(R) Advanced-N 6230 ABG", | 613 | .name = "Intel(R) Centrino(R) Advanced-N 6230 ABG", |
625 | .fw_name_pre = IWL6000G2B_FW_PRE, | 614 | IWL_DEVICE_6030, |
626 | .ucode_api_max = IWL6000G2_UCODE_API_MAX, | ||
627 | .ucode_api_min = IWL6000G2_UCODE_API_MIN, | ||
628 | .eeprom_ver = EEPROM_6000G2_EEPROM_VERSION, | ||
629 | .eeprom_calib_ver = EEPROM_6000G2_TX_POWER_VERSION, | ||
630 | .ops = &iwl6000g2b_ops, | ||
631 | .mod_params = &iwlagn_mod_params, | ||
632 | .base_params = &iwl6000_coex_base_params, | ||
633 | .bt_params = &iwl6000_bt_params, | ||
634 | .need_dc_calib = true, | ||
635 | .need_temp_offset_calib = true, | ||
636 | .led_mode = IWL_LED_RF_STATE, | ||
637 | .adv_pm = true, | ||
638 | /* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */ | ||
639 | .scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A, | ||
640 | .use_new_eeprom_reading = true, | ||
641 | }; | 615 | }; |
642 | 616 | ||
643 | struct iwl_cfg iwl6030_2bgn_cfg = { | 617 | struct iwl_cfg iwl6030_2bgn_cfg = { |
644 | .name = "Intel(R) Centrino(R) Advanced-N 6230 BGN", | 618 | .name = "Intel(R) Centrino(R) Advanced-N 6230 BGN", |
645 | .fw_name_pre = IWL6000G2B_FW_PRE, | 619 | IWL_DEVICE_6030, |
646 | .ucode_api_max = IWL6000G2_UCODE_API_MAX, | ||
647 | .ucode_api_min = IWL6000G2_UCODE_API_MIN, | ||
648 | .eeprom_ver = EEPROM_6000G2_EEPROM_VERSION, | ||
649 | .eeprom_calib_ver = EEPROM_6000G2_TX_POWER_VERSION, | ||
650 | .ops = &iwl6000g2b_ops, | ||
651 | .mod_params = &iwlagn_mod_params, | ||
652 | .base_params = &iwl6000_coex_base_params, | ||
653 | .bt_params = &iwl6000_bt_params, | ||
654 | .ht_params = &iwl6000_ht_params, | 620 | .ht_params = &iwl6000_ht_params, |
655 | .need_dc_calib = true, | ||
656 | .need_temp_offset_calib = true, | ||
657 | .led_mode = IWL_LED_RF_STATE, | ||
658 | .adv_pm = true, | ||
659 | /* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */ | ||
660 | .scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A, | ||
661 | .use_new_eeprom_reading = true, | ||
662 | }; | 621 | }; |
663 | 622 | ||
664 | struct iwl_cfg iwl6030_2bg_cfg = { | 623 | struct iwl_cfg iwl6030_2bg_cfg = { |
665 | .name = "Intel(R) Centrino(R) Advanced-N 6230 BG", | 624 | .name = "Intel(R) Centrino(R) Advanced-N 6230 BG", |
666 | .fw_name_pre = IWL6000G2B_FW_PRE, | 625 | IWL_DEVICE_6030, |
667 | .ucode_api_max = IWL6000G2_UCODE_API_MAX, | ||
668 | .ucode_api_min = IWL6000G2_UCODE_API_MIN, | ||
669 | .eeprom_ver = EEPROM_6000G2_EEPROM_VERSION, | ||
670 | .eeprom_calib_ver = EEPROM_6000G2_TX_POWER_VERSION, | ||
671 | .ops = &iwl6000g2b_ops, | ||
672 | .mod_params = &iwlagn_mod_params, | ||
673 | .base_params = &iwl6000_coex_base_params, | ||
674 | .bt_params = &iwl6000_bt_params, | ||
675 | .need_dc_calib = true, | ||
676 | .need_temp_offset_calib = true, | ||
677 | .led_mode = IWL_LED_RF_STATE, | ||
678 | .adv_pm = true, | ||
679 | /* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */ | ||
680 | .scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A, | ||
681 | .use_new_eeprom_reading = true, | ||
682 | }; | 626 | }; |
683 | 627 | ||
684 | struct iwl_cfg iwl1030_bgn_cfg = { | 628 | struct iwl_cfg iwl1030_bgn_cfg = { |
685 | .name = "Intel(R) Centrino(R) Wireless-N 1030 BGN", | 629 | .name = "Intel(R) Centrino(R) Wireless-N 1030 BGN", |
686 | .fw_name_pre = IWL6000G2B_FW_PRE, | 630 | IWL_DEVICE_6030, |
687 | .ucode_api_max = IWL6000G2_UCODE_API_MAX, | ||
688 | .ucode_api_min = IWL6000G2_UCODE_API_MIN, | ||
689 | .eeprom_ver = EEPROM_6000G2_EEPROM_VERSION, | ||
690 | .eeprom_calib_ver = EEPROM_6000G2_TX_POWER_VERSION, | ||
691 | .ops = &iwl6000g2b_ops, | ||
692 | .mod_params = &iwlagn_mod_params, | ||
693 | .base_params = &iwl6000_coex_base_params, | ||
694 | .bt_params = &iwl6000_bt_params, | ||
695 | .ht_params = &iwl6000_ht_params, | 631 | .ht_params = &iwl6000_ht_params, |
696 | .need_dc_calib = true, | ||
697 | .need_temp_offset_calib = true, | ||
698 | .led_mode = IWL_LED_RF_STATE, | ||
699 | .adv_pm = true, | ||
700 | /* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */ | ||
701 | .scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A, | ||
702 | .use_new_eeprom_reading = true, | ||
703 | }; | 632 | }; |
704 | 633 | ||
705 | struct iwl_cfg iwl1030_bg_cfg = { | 634 | struct iwl_cfg iwl1030_bg_cfg = { |
706 | .name = "Intel(R) Centrino(R) Wireless-N 1030 BG", | 635 | .name = "Intel(R) Centrino(R) Wireless-N 1030 BG", |
707 | .fw_name_pre = IWL6000G2B_FW_PRE, | 636 | IWL_DEVICE_6030, |
708 | .ucode_api_max = IWL6000G2_UCODE_API_MAX, | 637 | }; |
709 | .ucode_api_min = IWL6000G2_UCODE_API_MIN, | 638 | |
710 | .eeprom_ver = EEPROM_6000G2_EEPROM_VERSION, | 639 | struct iwl_cfg iwl130_bgn_cfg = { |
711 | .eeprom_calib_ver = EEPROM_6000G2_TX_POWER_VERSION, | 640 | .name = "Intel(R) Centrino(R) Wireless-N 130 BGN", |
712 | .ops = &iwl6000g2b_ops, | 641 | IWL_DEVICE_6030, |
713 | .mod_params = &iwlagn_mod_params, | 642 | .ht_params = &iwl6000_ht_params, |
714 | .base_params = &iwl6000_coex_base_params, | 643 | .rx_with_siso_diversity = true, |
715 | .bt_params = &iwl6000_bt_params, | 644 | }; |
716 | .need_dc_calib = true, | 645 | |
717 | .need_temp_offset_calib = true, | 646 | struct iwl_cfg iwl130_bg_cfg = { |
718 | .led_mode = IWL_LED_RF_STATE, | 647 | .name = "Intel(R) Centrino(R) Wireless-N 130 BG", |
719 | .adv_pm = true, | 648 | IWL_DEVICE_6030, |
720 | /* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */ | 649 | .rx_with_siso_diversity = true, |
721 | .scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A, | ||
722 | .use_new_eeprom_reading = true, | ||
723 | }; | 650 | }; |
724 | 651 | ||
725 | /* | 652 | /* |
726 | * "i": Internal configuration, use internal Power Amplifier | 653 | * "i": Internal configuration, use internal Power Amplifier |
727 | */ | 654 | */ |
655 | #define IWL_DEVICE_6000i \ | ||
656 | .fw_name_pre = IWL6000_FW_PRE, \ | ||
657 | .ucode_api_max = IWL6000_UCODE_API_MAX, \ | ||
658 | .ucode_api_min = IWL6000_UCODE_API_MIN, \ | ||
659 | .valid_tx_ant = ANT_BC, /* .cfg overwrite */ \ | ||
660 | .valid_rx_ant = ANT_BC, /* .cfg overwrite */ \ | ||
661 | .eeprom_ver = EEPROM_6000_EEPROM_VERSION, \ | ||
662 | .eeprom_calib_ver = EEPROM_6000_TX_POWER_VERSION, \ | ||
663 | .ops = &iwl6000_ops, \ | ||
664 | .mod_params = &iwlagn_mod_params, \ | ||
665 | .base_params = &iwl6000_base_params, \ | ||
666 | .pa_type = IWL_PA_INTERNAL, \ | ||
667 | .led_mode = IWL_LED_BLINK | ||
668 | |||
728 | struct iwl_cfg iwl6000i_2agn_cfg = { | 669 | struct iwl_cfg iwl6000i_2agn_cfg = { |
729 | .name = "Intel(R) Centrino(R) Advanced-N 6200 AGN", | 670 | .name = "Intel(R) Centrino(R) Advanced-N 6200 AGN", |
730 | .fw_name_pre = IWL6000_FW_PRE, | 671 | IWL_DEVICE_6000i, |
731 | .ucode_api_max = IWL6000_UCODE_API_MAX, | ||
732 | .ucode_api_min = IWL6000_UCODE_API_MIN, | ||
733 | .valid_tx_ant = ANT_BC, /* .cfg overwrite */ | ||
734 | .valid_rx_ant = ANT_BC, /* .cfg overwrite */ | ||
735 | .eeprom_ver = EEPROM_6000_EEPROM_VERSION, | ||
736 | .eeprom_calib_ver = EEPROM_6000_TX_POWER_VERSION, | ||
737 | .ops = &iwl6000_ops, | ||
738 | .mod_params = &iwlagn_mod_params, | ||
739 | .base_params = &iwl6000_base_params, | ||
740 | .ht_params = &iwl6000_ht_params, | 672 | .ht_params = &iwl6000_ht_params, |
741 | .pa_type = IWL_PA_INTERNAL, | ||
742 | .led_mode = IWL_LED_BLINK, | ||
743 | }; | 673 | }; |
744 | 674 | ||
745 | struct iwl_cfg iwl6000i_2abg_cfg = { | 675 | struct iwl_cfg iwl6000i_2abg_cfg = { |
746 | .name = "Intel(R) Centrino(R) Advanced-N 6200 ABG", | 676 | .name = "Intel(R) Centrino(R) Advanced-N 6200 ABG", |
747 | .fw_name_pre = IWL6000_FW_PRE, | 677 | IWL_DEVICE_6000i, |
748 | .ucode_api_max = IWL6000_UCODE_API_MAX, | ||
749 | .ucode_api_min = IWL6000_UCODE_API_MIN, | ||
750 | .valid_tx_ant = ANT_BC, /* .cfg overwrite */ | ||
751 | .valid_rx_ant = ANT_BC, /* .cfg overwrite */ | ||
752 | .eeprom_ver = EEPROM_6000_EEPROM_VERSION, | ||
753 | .eeprom_calib_ver = EEPROM_6000_TX_POWER_VERSION, | ||
754 | .ops = &iwl6000_ops, | ||
755 | .mod_params = &iwlagn_mod_params, | ||
756 | .base_params = &iwl6000_base_params, | ||
757 | .pa_type = IWL_PA_INTERNAL, | ||
758 | .led_mode = IWL_LED_BLINK, | ||
759 | }; | 678 | }; |
760 | 679 | ||
761 | struct iwl_cfg iwl6000i_2bg_cfg = { | 680 | struct iwl_cfg iwl6000i_2bg_cfg = { |
762 | .name = "Intel(R) Centrino(R) Advanced-N 6200 BG", | 681 | .name = "Intel(R) Centrino(R) Advanced-N 6200 BG", |
763 | .fw_name_pre = IWL6000_FW_PRE, | 682 | IWL_DEVICE_6000i, |
764 | .ucode_api_max = IWL6000_UCODE_API_MAX, | 683 | }; |
765 | .ucode_api_min = IWL6000_UCODE_API_MIN, | 684 | |
766 | .valid_tx_ant = ANT_BC, /* .cfg overwrite */ | 685 | #define IWL_DEVICE_6050 \ |
767 | .valid_rx_ant = ANT_BC, /* .cfg overwrite */ | 686 | .fw_name_pre = IWL6050_FW_PRE, \ |
768 | .eeprom_ver = EEPROM_6000_EEPROM_VERSION, | 687 | .ucode_api_max = IWL6050_UCODE_API_MAX, \ |
769 | .eeprom_calib_ver = EEPROM_6000_TX_POWER_VERSION, | 688 | .ucode_api_min = IWL6050_UCODE_API_MIN, \ |
770 | .ops = &iwl6000_ops, | 689 | .ops = &iwl6050_ops, \ |
771 | .mod_params = &iwlagn_mod_params, | 690 | .eeprom_ver = EEPROM_6050_EEPROM_VERSION, \ |
772 | .base_params = &iwl6000_base_params, | 691 | .eeprom_calib_ver = EEPROM_6050_TX_POWER_VERSION, \ |
773 | .pa_type = IWL_PA_INTERNAL, | 692 | .mod_params = &iwlagn_mod_params, \ |
774 | .led_mode = IWL_LED_BLINK, | 693 | .base_params = &iwl6050_base_params, \ |
775 | }; | 694 | .need_dc_calib = true, \ |
695 | .led_mode = IWL_LED_BLINK, \ | ||
696 | .internal_wimax_coex = true | ||
776 | 697 | ||
777 | struct iwl_cfg iwl6050_2agn_cfg = { | 698 | struct iwl_cfg iwl6050_2agn_cfg = { |
778 | .name = "Intel(R) Centrino(R) Advanced-N + WiMAX 6250 AGN", | 699 | .name = "Intel(R) Centrino(R) Advanced-N + WiMAX 6250 AGN", |
779 | .fw_name_pre = IWL6050_FW_PRE, | 700 | IWL_DEVICE_6050, |
780 | .ucode_api_max = IWL6050_UCODE_API_MAX, | ||
781 | .ucode_api_min = IWL6050_UCODE_API_MIN, | ||
782 | .ops = &iwl6050_ops, | ||
783 | .eeprom_ver = EEPROM_6050_EEPROM_VERSION, | ||
784 | .eeprom_calib_ver = EEPROM_6050_TX_POWER_VERSION, | ||
785 | .mod_params = &iwlagn_mod_params, | ||
786 | .base_params = &iwl6050_base_params, | ||
787 | .ht_params = &iwl6000_ht_params, | 701 | .ht_params = &iwl6000_ht_params, |
788 | .need_dc_calib = true, | 702 | }; |
789 | .led_mode = IWL_LED_BLINK, | 703 | |
704 | struct iwl_cfg iwl6050_2abg_cfg = { | ||
705 | .name = "Intel(R) Centrino(R) Advanced-N + WiMAX 6250 ABG", | ||
706 | IWL_DEVICE_6050, | ||
790 | }; | 707 | }; |
791 | 708 | ||
792 | struct iwl_cfg iwl6150_bgn_cfg = { | 709 | struct iwl_cfg iwl6150_bgn_cfg = { |
@@ -802,21 +719,7 @@ struct iwl_cfg iwl6150_bgn_cfg = { | |||
802 | .ht_params = &iwl6000_ht_params, | 719 | .ht_params = &iwl6000_ht_params, |
803 | .need_dc_calib = true, | 720 | .need_dc_calib = true, |
804 | .led_mode = IWL_LED_RF_STATE, | 721 | .led_mode = IWL_LED_RF_STATE, |
805 | .use_new_eeprom_reading = true, | 722 | .internal_wimax_coex = true, |
806 | }; | ||
807 | |||
808 | struct iwl_cfg iwl6050_2abg_cfg = { | ||
809 | .name = "Intel(R) Centrino(R) Advanced-N + WiMAX 6250 ABG", | ||
810 | .fw_name_pre = IWL6050_FW_PRE, | ||
811 | .ucode_api_max = IWL6050_UCODE_API_MAX, | ||
812 | .ucode_api_min = IWL6050_UCODE_API_MIN, | ||
813 | .eeprom_ver = EEPROM_6050_EEPROM_VERSION, | ||
814 | .eeprom_calib_ver = EEPROM_6050_TX_POWER_VERSION, | ||
815 | .ops = &iwl6050_ops, | ||
816 | .mod_params = &iwlagn_mod_params, | ||
817 | .base_params = &iwl6050_base_params, | ||
818 | .need_dc_calib = true, | ||
819 | .led_mode = IWL_LED_BLINK, | ||
820 | }; | 723 | }; |
821 | 724 | ||
822 | struct iwl_cfg iwl6000_3agn_cfg = { | 725 | struct iwl_cfg iwl6000_3agn_cfg = { |
@@ -834,45 +737,6 @@ struct iwl_cfg iwl6000_3agn_cfg = { | |||
834 | .led_mode = IWL_LED_BLINK, | 737 | .led_mode = IWL_LED_BLINK, |
835 | }; | 738 | }; |
836 | 739 | ||
837 | struct iwl_cfg iwl130_bgn_cfg = { | ||
838 | .name = "Intel(R) Centrino(R) Wireless-N 130 BGN", | ||
839 | .fw_name_pre = IWL6000G2B_FW_PRE, | ||
840 | .ucode_api_max = IWL6000G2_UCODE_API_MAX, | ||
841 | .ucode_api_min = IWL6000G2_UCODE_API_MIN, | ||
842 | .eeprom_ver = EEPROM_6000G2_EEPROM_VERSION, | ||
843 | .eeprom_calib_ver = EEPROM_6000G2_TX_POWER_VERSION, | ||
844 | .ops = &iwl6000g2b_ops, | ||
845 | .mod_params = &iwlagn_mod_params, | ||
846 | .base_params = &iwl6000_coex_base_params, | ||
847 | .bt_params = &iwl6000_bt_params, | ||
848 | .ht_params = &iwl6000_ht_params, | ||
849 | .need_dc_calib = true, | ||
850 | .led_mode = IWL_LED_RF_STATE, | ||
851 | .adv_pm = true, | ||
852 | /* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */ | ||
853 | .scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A, | ||
854 | .use_new_eeprom_reading = true, | ||
855 | }; | ||
856 | |||
857 | struct iwl_cfg iwl130_bg_cfg = { | ||
858 | .name = "Intel(R) Centrino(R) Wireless-N 130 BG", | ||
859 | .fw_name_pre = IWL6000G2B_FW_PRE, | ||
860 | .ucode_api_max = IWL6000G2_UCODE_API_MAX, | ||
861 | .ucode_api_min = IWL6000G2_UCODE_API_MIN, | ||
862 | .eeprom_ver = EEPROM_6000G2_EEPROM_VERSION, | ||
863 | .eeprom_calib_ver = EEPROM_6000G2_TX_POWER_VERSION, | ||
864 | .ops = &iwl6000g2b_ops, | ||
865 | .mod_params = &iwlagn_mod_params, | ||
866 | .base_params = &iwl6000_coex_base_params, | ||
867 | .bt_params = &iwl6000_bt_params, | ||
868 | .need_dc_calib = true, | ||
869 | .led_mode = IWL_LED_RF_STATE, | ||
870 | .adv_pm = true, | ||
871 | /* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */ | ||
872 | .scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A, | ||
873 | .use_new_eeprom_reading = true, | ||
874 | }; | ||
875 | |||
876 | MODULE_FIRMWARE(IWL6000_MODULE_FIRMWARE(IWL6000_UCODE_API_MAX)); | 740 | MODULE_FIRMWARE(IWL6000_MODULE_FIRMWARE(IWL6000_UCODE_API_MAX)); |
877 | MODULE_FIRMWARE(IWL6050_MODULE_FIRMWARE(IWL6050_UCODE_API_MAX)); | 741 | MODULE_FIRMWARE(IWL6050_MODULE_FIRMWARE(IWL6050_UCODE_API_MAX)); |
878 | MODULE_FIRMWARE(IWL6000G2A_MODULE_FIRMWARE(IWL6000G2_UCODE_API_MAX)); | 742 | MODULE_FIRMWARE(IWL6000G2A_MODULE_FIRMWARE(IWL6000G2_UCODE_API_MAX)); |