Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.git] / drivers / net / wireless / ath / ath9k / ar9003_hw.c

diff --git a/drivers/net/wireless/ath/ath9k/ar9003_hw.c b/drivers/net/wireless/ath/ath9k/ar9003_hw.c
index 7f5de6e..a55eddb 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/ar9003_hw.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_hw.c
@@ -18,6 +18,7 @@
 #include "ar9003_mac.h"
 #include "ar9003_2p2_initvals.h"
 #include "ar9485_initvals.h"
+#include "ar9340_initvals.h"
 
 /* General hardware code for the AR9003 hadware family */
 
@@ -28,109 +29,105 @@
  */
 static void ar9003_hw_init_mode_regs(struct ath_hw *ah)
 {
-       if (AR_SREV_9485_11(ah)) {
+       if (AR_SREV_9340(ah)) {
                /* mac */
                INIT_INI_ARRAY(&ah->iniMac[ATH_INI_PRE], NULL, 0, 0);
                INIT_INI_ARRAY(&ah->iniMac[ATH_INI_CORE],
-                               ar9485_1_1_mac_core,
-                               ARRAY_SIZE(ar9485_1_1_mac_core), 2);
+                               ar9340_1p0_mac_core,
+                               ARRAY_SIZE(ar9340_1p0_mac_core), 2);
                INIT_INI_ARRAY(&ah->iniMac[ATH_INI_POST],
-                               ar9485_1_1_mac_postamble,
-                               ARRAY_SIZE(ar9485_1_1_mac_postamble), 5);
+                               ar9340_1p0_mac_postamble,
+                               ARRAY_SIZE(ar9340_1p0_mac_postamble), 5);
 
                /* bb */
-               INIT_INI_ARRAY(&ah->iniBB[ATH_INI_PRE], ar9485_1_1,
-                               ARRAY_SIZE(ar9485_1_1), 2);
+               INIT_INI_ARRAY(&ah->iniBB[ATH_INI_PRE], NULL, 0, 0);
                INIT_INI_ARRAY(&ah->iniBB[ATH_INI_CORE],
-                               ar9485_1_1_baseband_core,
-                               ARRAY_SIZE(ar9485_1_1_baseband_core), 2);
+                               ar9340_1p0_baseband_core,
+                               ARRAY_SIZE(ar9340_1p0_baseband_core), 2);
                INIT_INI_ARRAY(&ah->iniBB[ATH_INI_POST],
-                               ar9485_1_1_baseband_postamble,
-                               ARRAY_SIZE(ar9485_1_1_baseband_postamble), 5);
+                               ar9340_1p0_baseband_postamble,
+                               ARRAY_SIZE(ar9340_1p0_baseband_postamble), 5);
 
                /* radio */
                INIT_INI_ARRAY(&ah->iniRadio[ATH_INI_PRE], NULL, 0, 0);
                INIT_INI_ARRAY(&ah->iniRadio[ATH_INI_CORE],
-                               ar9485_1_1_radio_core,
-                               ARRAY_SIZE(ar9485_1_1_radio_core), 2);
+                               ar9340_1p0_radio_core,
+                               ARRAY_SIZE(ar9340_1p0_radio_core), 2);
                INIT_INI_ARRAY(&ah->iniRadio[ATH_INI_POST],
-                               ar9485_1_1_radio_postamble,
-                               ARRAY_SIZE(ar9485_1_1_radio_postamble), 2);
+                               ar9340_1p0_radio_postamble,
+                               ARRAY_SIZE(ar9340_1p0_radio_postamble), 5);
 
                /* soc */
                INIT_INI_ARRAY(&ah->iniSOC[ATH_INI_PRE],
-                               ar9485_1_1_soc_preamble,
-                               ARRAY_SIZE(ar9485_1_1_soc_preamble), 2);
+                               ar9340_1p0_soc_preamble,
+                               ARRAY_SIZE(ar9340_1p0_soc_preamble), 2);
                INIT_INI_ARRAY(&ah->iniSOC[ATH_INI_CORE], NULL, 0, 0);
-               INIT_INI_ARRAY(&ah->iniSOC[ATH_INI_POST], NULL, 0, 0);
+               INIT_INI_ARRAY(&ah->iniSOC[ATH_INI_POST],
+                               ar9340_1p0_soc_postamble,
+                               ARRAY_SIZE(ar9340_1p0_soc_postamble), 5);
 
                /* rx/tx gain */
                INIT_INI_ARRAY(&ah->iniModesRxGain,
-                               ar9485_common_rx_gain_1_1,
-                               ARRAY_SIZE(ar9485_common_rx_gain_1_1), 2);
+                               ar9340Common_wo_xlna_rx_gain_table_1p0,
+                               ARRAY_SIZE(ar9340Common_wo_xlna_rx_gain_table_1p0),
+                               5);
                INIT_INI_ARRAY(&ah->iniModesTxGain,
-                               ar9485_modes_lowest_ob_db_tx_gain_1_1,
-                               ARRAY_SIZE(ar9485_modes_lowest_ob_db_tx_gain_1_1),
+                               ar9340Modes_high_ob_db_tx_gain_table_1p0,
+                               ARRAY_SIZE(ar9340Modes_high_ob_db_tx_gain_table_1p0),
                                5);
 
-               /* Load PCIE SERDES settings from INI */
-
-               /* Awake Setting */
-
-               INIT_INI_ARRAY(&ah->iniPcieSerdes,
-                               ar9485_1_1_pcie_phy_clkreq_disable_L1,
-                               ARRAY_SIZE(ar9485_1_1_pcie_phy_clkreq_disable_L1),
-                               2);
-
-               /* Sleep Setting */
+               INIT_INI_ARRAY(&ah->iniModesAdditional,
+                               ar9340Modes_fast_clock_1p0,
+                               ARRAY_SIZE(ar9340Modes_fast_clock_1p0),
+                               3);
 
-               INIT_INI_ARRAY(&ah->iniPcieSerdesLowPower,
-                               ar9485_1_1_pcie_phy_clkreq_disable_L1,
-                               ARRAY_SIZE(ar9485_1_1_pcie_phy_clkreq_disable_L1),
+               INIT_INI_ARRAY(&ah->iniModesAdditional_40M,
+                               ar9340_1p0_radio_core_40M,
+                               ARRAY_SIZE(ar9340_1p0_radio_core_40M),
                                2);
-       } else if (AR_SREV_9485(ah)) {
+       } else if (AR_SREV_9485_11(ah)) {
                /* mac */
                INIT_INI_ARRAY(&ah->iniMac[ATH_INI_PRE], NULL, 0, 0);
                INIT_INI_ARRAY(&ah->iniMac[ATH_INI_CORE],
-                               ar9485_1_0_mac_core,
-                               ARRAY_SIZE(ar9485_1_0_mac_core), 2);
+                               ar9485_1_1_mac_core,
+                               ARRAY_SIZE(ar9485_1_1_mac_core), 2);
                INIT_INI_ARRAY(&ah->iniMac[ATH_INI_POST],
-                               ar9485_1_0_mac_postamble,
-                               ARRAY_SIZE(ar9485_1_0_mac_postamble), 5);
+                               ar9485_1_1_mac_postamble,
+                               ARRAY_SIZE(ar9485_1_1_mac_postamble), 5);
 
                /* bb */
-               INIT_INI_ARRAY(&ah->iniBB[ATH_INI_PRE], ar9485_1_0,
-                               ARRAY_SIZE(ar9485_1_0), 2);
+               INIT_INI_ARRAY(&ah->iniBB[ATH_INI_PRE], ar9485_1_1,
+                               ARRAY_SIZE(ar9485_1_1), 2);
                INIT_INI_ARRAY(&ah->iniBB[ATH_INI_CORE],
-                               ar9485_1_0_baseband_core,
-                               ARRAY_SIZE(ar9485_1_0_baseband_core), 2);
+                               ar9485_1_1_baseband_core,
+                               ARRAY_SIZE(ar9485_1_1_baseband_core), 2);
                INIT_INI_ARRAY(&ah->iniBB[ATH_INI_POST],
-                               ar9485_1_0_baseband_postamble,
-                               ARRAY_SIZE(ar9485_1_0_baseband_postamble), 5);
+                               ar9485_1_1_baseband_postamble,
+                               ARRAY_SIZE(ar9485_1_1_baseband_postamble), 5);
 
                /* radio */
                INIT_INI_ARRAY(&ah->iniRadio[ATH_INI_PRE], NULL, 0, 0);
                INIT_INI_ARRAY(&ah->iniRadio[ATH_INI_CORE],
-                               ar9485_1_0_radio_core,
-                               ARRAY_SIZE(ar9485_1_0_radio_core), 2);
+                               ar9485_1_1_radio_core,
+                               ARRAY_SIZE(ar9485_1_1_radio_core), 2);
                INIT_INI_ARRAY(&ah->iniRadio[ATH_INI_POST],
-                               ar9485_1_0_radio_postamble,
-                               ARRAY_SIZE(ar9485_1_0_radio_postamble), 2);
+                               ar9485_1_1_radio_postamble,
+                               ARRAY_SIZE(ar9485_1_1_radio_postamble), 2);
 
                /* soc */
                INIT_INI_ARRAY(&ah->iniSOC[ATH_INI_PRE],
-                               ar9485_1_0_soc_preamble,
-                               ARRAY_SIZE(ar9485_1_0_soc_preamble), 2);
+                               ar9485_1_1_soc_preamble,
+                               ARRAY_SIZE(ar9485_1_1_soc_preamble), 2);
                INIT_INI_ARRAY(&ah->iniSOC[ATH_INI_CORE], NULL, 0, 0);
                INIT_INI_ARRAY(&ah->iniSOC[ATH_INI_POST], NULL, 0, 0);
 
                /* rx/tx gain */
                INIT_INI_ARRAY(&ah->iniModesRxGain,
-                               ar9485Common_rx_gain_1_0,
-                               ARRAY_SIZE(ar9485Common_rx_gain_1_0), 2);
+                               ar9485Common_wo_xlna_rx_gain_1_1,
+                               ARRAY_SIZE(ar9485Common_wo_xlna_rx_gain_1_1), 2);
                INIT_INI_ARRAY(&ah->iniModesTxGain,
-                               ar9485Modes_lowest_ob_db_tx_gain_1_0,
-                               ARRAY_SIZE(ar9485Modes_lowest_ob_db_tx_gain_1_0),
+                               ar9485_modes_lowest_ob_db_tx_gain_1_1,
+                               ARRAY_SIZE(ar9485_modes_lowest_ob_db_tx_gain_1_1),
                                5);
 
                /* Load PCIE SERDES settings from INI */
@@ -138,15 +135,15 @@ static void ar9003_hw_init_mode_regs(struct ath_hw *ah)
                /* Awake Setting */
 
                INIT_INI_ARRAY(&ah->iniPcieSerdes,
-                               ar9485_1_0_pcie_phy_pll_on_clkreq_disable_L1,
-                               ARRAY_SIZE(ar9485_1_0_pcie_phy_pll_on_clkreq_disable_L1),
+                               ar9485_1_1_pcie_phy_clkreq_disable_L1,
+                               ARRAY_SIZE(ar9485_1_1_pcie_phy_clkreq_disable_L1),
                                2);
 
                /* Sleep Setting */
 
                INIT_INI_ARRAY(&ah->iniPcieSerdesLowPower,
-                               ar9485_1_0_pcie_phy_pll_on_clkreq_disable_L1,
-                               ARRAY_SIZE(ar9485_1_0_pcie_phy_pll_on_clkreq_disable_L1),
+                               ar9485_1_1_pcie_phy_clkreq_disable_L1,
+                               ARRAY_SIZE(ar9485_1_1_pcie_phy_clkreq_disable_L1),
                                2);
        } else {
                /* mac */
@@ -223,15 +220,15 @@ static void ar9003_tx_gain_table_apply(struct ath_hw *ah)
        switch (ar9003_hw_get_tx_gain_idx(ah)) {
        case 0:
        default:
-               if (AR_SREV_9485_11(ah))
+               if (AR_SREV_9340(ah))
                        INIT_INI_ARRAY(&ah->iniModesTxGain,
-                                      ar9485_modes_lowest_ob_db_tx_gain_1_1,
-                                      ARRAY_SIZE(ar9485_modes_lowest_ob_db_tx_gain_1_1),
+                                       ar9340Modes_lowest_ob_db_tx_gain_table_1p0,
+                                      ARRAY_SIZE(ar9340Modes_lowest_ob_db_tx_gain_table_1p0),
                                       5);
-               else if (AR_SREV_9485(ah))
+               else if (AR_SREV_9485_11(ah))
                        INIT_INI_ARRAY(&ah->iniModesTxGain,
-                                      ar9485Modes_lowest_ob_db_tx_gain_1_0,
-                                      ARRAY_SIZE(ar9485Modes_lowest_ob_db_tx_gain_1_0),
+                                      ar9485_modes_lowest_ob_db_tx_gain_1_1,
+                                      ARRAY_SIZE(ar9485_modes_lowest_ob_db_tx_gain_1_1),
                                       5);
                else
                        INIT_INI_ARRAY(&ah->iniModesTxGain,
@@ -240,15 +237,15 @@ static void ar9003_tx_gain_table_apply(struct ath_hw *ah)
                                       5);
                break;
        case 1:
-               if (AR_SREV_9485_11(ah))
+               if (AR_SREV_9340(ah))
                        INIT_INI_ARRAY(&ah->iniModesTxGain,
-                                      ar9485Modes_high_ob_db_tx_gain_1_1,
-                                      ARRAY_SIZE(ar9485Modes_high_ob_db_tx_gain_1_1),
+                                       ar9340Modes_lowest_ob_db_tx_gain_table_1p0,
+                                      ARRAY_SIZE(ar9340Modes_lowest_ob_db_tx_gain_table_1p0),
                                       5);
-               else if (AR_SREV_9485(ah))
+               else if (AR_SREV_9485_11(ah))
                        INIT_INI_ARRAY(&ah->iniModesTxGain,
-                                      ar9485Modes_high_ob_db_tx_gain_1_0,
-                                      ARRAY_SIZE(ar9485Modes_high_ob_db_tx_gain_1_0),
+                                      ar9485Modes_high_ob_db_tx_gain_1_1,
+                                      ARRAY_SIZE(ar9485Modes_high_ob_db_tx_gain_1_1),
                                       5);
                else
                        INIT_INI_ARRAY(&ah->iniModesTxGain,
@@ -257,15 +254,15 @@ static void ar9003_tx_gain_table_apply(struct ath_hw *ah)
                                       5);
                break;
        case 2:
-               if (AR_SREV_9485_11(ah))
+               if (AR_SREV_9340(ah))
                        INIT_INI_ARRAY(&ah->iniModesTxGain,
-                                      ar9485Modes_low_ob_db_tx_gain_1_1,
-                                      ARRAY_SIZE(ar9485Modes_low_ob_db_tx_gain_1_1),
+                                       ar9340Modes_lowest_ob_db_tx_gain_table_1p0,
+                                      ARRAY_SIZE(ar9340Modes_lowest_ob_db_tx_gain_table_1p0),
                                       5);
-               else if (AR_SREV_9485(ah))
+               else if (AR_SREV_9485_11(ah))
                        INIT_INI_ARRAY(&ah->iniModesTxGain,
-                                      ar9485Modes_low_ob_db_tx_gain_1_0,
-                                      ARRAY_SIZE(ar9485Modes_low_ob_db_tx_gain_1_0),
+                                      ar9485Modes_low_ob_db_tx_gain_1_1,
+                                      ARRAY_SIZE(ar9485Modes_low_ob_db_tx_gain_1_1),
                                       5);
                else
                        INIT_INI_ARRAY(&ah->iniModesTxGain,
@@ -274,15 +271,15 @@ static void ar9003_tx_gain_table_apply(struct ath_hw *ah)
                                       5);
                break;
        case 3:
-               if (AR_SREV_9485_11(ah))
+               if (AR_SREV_9340(ah))
                        INIT_INI_ARRAY(&ah->iniModesTxGain,
-                                      ar9485Modes_high_power_tx_gain_1_1,
-                                      ARRAY_SIZE(ar9485Modes_high_power_tx_gain_1_1),
+                                       ar9340Modes_lowest_ob_db_tx_gain_table_1p0,
+                                      ARRAY_SIZE(ar9340Modes_lowest_ob_db_tx_gain_table_1p0),
                                       5);
-               else if (AR_SREV_9485(ah))
+               else if (AR_SREV_9485_11(ah))
                        INIT_INI_ARRAY(&ah->iniModesTxGain,
-                                      ar9485Modes_high_power_tx_gain_1_0,
-                                      ARRAY_SIZE(ar9485Modes_high_power_tx_gain_1_0),
+                                      ar9485Modes_high_power_tx_gain_1_1,
+                                      ARRAY_SIZE(ar9485Modes_high_power_tx_gain_1_1),
                                       5);
                else
                        INIT_INI_ARRAY(&ah->iniModesTxGain,
@@ -298,15 +295,15 @@ static void ar9003_rx_gain_table_apply(struct ath_hw *ah)
        switch (ar9003_hw_get_rx_gain_idx(ah)) {
        case 0:
        default:
-               if (AR_SREV_9485_11(ah))
+               if (AR_SREV_9340(ah))
                        INIT_INI_ARRAY(&ah->iniModesRxGain,
-                                      ar9485_common_rx_gain_1_1,
-                                      ARRAY_SIZE(ar9485_common_rx_gain_1_1),
+                                      ar9340Common_rx_gain_table_1p0,
+                                      ARRAY_SIZE(ar9340Common_rx_gain_table_1p0),
                                       2);
-               else if (AR_SREV_9485(ah))
+               else if (AR_SREV_9485_11(ah))
                        INIT_INI_ARRAY(&ah->iniModesRxGain,
-                                      ar9485Common_rx_gain_1_0,
-                                      ARRAY_SIZE(ar9485Common_rx_gain_1_0),
+                                      ar9485Common_wo_xlna_rx_gain_1_1,
+                                      ARRAY_SIZE(ar9485Common_wo_xlna_rx_gain_1_1),
                                       2);
                else
                        INIT_INI_ARRAY(&ah->iniModesRxGain,
@@ -315,15 +312,15 @@ static void ar9003_rx_gain_table_apply(struct ath_hw *ah)
                                       2);
                break;
        case 1:
-               if (AR_SREV_9485_11(ah))
+               if (AR_SREV_9340(ah))
                        INIT_INI_ARRAY(&ah->iniModesRxGain,
-                                      ar9485Common_wo_xlna_rx_gain_1_1,
-                                      ARRAY_SIZE(ar9485Common_wo_xlna_rx_gain_1_1),
+                                      ar9340Common_wo_xlna_rx_gain_table_1p0,
+                                      ARRAY_SIZE(ar9340Common_wo_xlna_rx_gain_table_1p0),
                                       2);
-               else if (AR_SREV_9485(ah))
+               else if (AR_SREV_9485_11(ah))
                        INIT_INI_ARRAY(&ah->iniModesRxGain,
-                                      ar9485Common_wo_xlna_rx_gain_1_0,
-                                      ARRAY_SIZE(ar9485Common_wo_xlna_rx_gain_1_0),
+                                      ar9485Common_wo_xlna_rx_gain_1_1,
+                                      ARRAY_SIZE(ar9485Common_wo_xlna_rx_gain_1_1),
                                       2);
                else
                        INIT_INI_ARRAY(&ah->iniModesRxGain,