ath9k_hw: Initialize tx and rx gain table from initvals.h for ar9340

Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/ath/ath9k/ar9003_hw.c b/drivers/net/wireless/ath/ath9k/ar9003_hw.c
index 37af7216a1a2232e800025e35dd3b047f85b320e..a55eddbb258923aaf85a35966fb35a3974fa15f0 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/ar9003_hw.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_hw.c
@@ -220,7 +220,12 @@ 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,
+                                       ar9340Modes_lowest_ob_db_tx_gain_table_1p0,
+                                      ARRAY_SIZE(ar9340Modes_lowest_ob_db_tx_gain_table_1p0),
+                                      5);
+               else if (AR_SREV_9485_11(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),
@@ -232,7 +237,12 @@ 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,
+                                       ar9340Modes_lowest_ob_db_tx_gain_table_1p0,
+                                      ARRAY_SIZE(ar9340Modes_lowest_ob_db_tx_gain_table_1p0),
+                                      5);
+               else if (AR_SREV_9485_11(ah))
                        INIT_INI_ARRAY(&ah->iniModesTxGain,
                                       ar9485Modes_high_ob_db_tx_gain_1_1,
                                       ARRAY_SIZE(ar9485Modes_high_ob_db_tx_gain_1_1),
@@ -244,7 +254,12 @@ 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,
+                                       ar9340Modes_lowest_ob_db_tx_gain_table_1p0,
+                                      ARRAY_SIZE(ar9340Modes_lowest_ob_db_tx_gain_table_1p0),
+                                      5);
+               else if (AR_SREV_9485_11(ah))
                        INIT_INI_ARRAY(&ah->iniModesTxGain,
                                       ar9485Modes_low_ob_db_tx_gain_1_1,
                                       ARRAY_SIZE(ar9485Modes_low_ob_db_tx_gain_1_1),
@@ -256,7 +271,12 @@ 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,
+                                       ar9340Modes_lowest_ob_db_tx_gain_table_1p0,
+                                      ARRAY_SIZE(ar9340Modes_lowest_ob_db_tx_gain_table_1p0),
+                                      5);
+               else if (AR_SREV_9485_11(ah))
                        INIT_INI_ARRAY(&ah->iniModesTxGain,
                                       ar9485Modes_high_power_tx_gain_1_1,
                                       ARRAY_SIZE(ar9485Modes_high_power_tx_gain_1_1),
@@ -275,7 +295,12 @@ 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,
+                                      ar9340Common_rx_gain_table_1p0,
+                                      ARRAY_SIZE(ar9340Common_rx_gain_table_1p0),
+                                      2);
+               else if (AR_SREV_9485_11(ah))
                        INIT_INI_ARRAY(&ah->iniModesRxGain,
                                       ar9485Common_wo_xlna_rx_gain_1_1,
                                       ARRAY_SIZE(ar9485Common_wo_xlna_rx_gain_1_1),
@@ -287,7 +312,12 @@ 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,
+                                      ar9340Common_wo_xlna_rx_gain_table_1p0,
+                                      ARRAY_SIZE(ar9340Common_wo_xlna_rx_gain_table_1p0),
+                                      2);
+               else if (AR_SREV_9485_11(ah))
                        INIT_INI_ARRAY(&ah->iniModesRxGain,
                                       ar9485Common_wo_xlna_rx_gain_1_1,
                                       ARRAY_SIZE(ar9485Common_wo_xlna_rx_gain_1_1),