diff options
-rw-r--r-- | drivers/net/wireless/ath/ath9k/ar9003_hw.c | 5 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/ar9003_phy.c | 3 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/ar9462_2p0_initvals.h | 12 |
3 files changed, 0 insertions, 20 deletions
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_hw.c b/drivers/net/wireless/ath/ath9k/ar9003_hw.c index 0f56e322dd3b..a0e3394b10dc 100644 --- a/drivers/net/wireless/ath/ath9k/ar9003_hw.c +++ b/drivers/net/wireless/ath/ath9k/ar9003_hw.c | |||
@@ -305,11 +305,6 @@ static void ar9003_hw_init_mode_regs(struct ath_hw *ah) | |||
305 | ar9462_common_rx_gain_table_2p0, | 305 | ar9462_common_rx_gain_table_2p0, |
306 | ARRAY_SIZE(ar9462_common_rx_gain_table_2p0), 2); | 306 | ARRAY_SIZE(ar9462_common_rx_gain_table_2p0), 2); |
307 | 307 | ||
308 | INIT_INI_ARRAY(&ah->ini_BTCOEX_MAX_TXPWR, | ||
309 | ar9462_2p0_BTCOEX_MAX_TXPWR_table, | ||
310 | ARRAY_SIZE(ar9462_2p0_BTCOEX_MAX_TXPWR_table), | ||
311 | 2); | ||
312 | |||
313 | /* Awake -> Sleep Setting */ | 308 | /* Awake -> Sleep Setting */ |
314 | INIT_INI_ARRAY(&ah->iniPcieSerdes, | 309 | INIT_INI_ARRAY(&ah->iniPcieSerdes, |
315 | PCIE_PLL_ON_CREQ_DIS_L1_2P0, | 310 | PCIE_PLL_ON_CREQ_DIS_L1_2P0, |
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_phy.c b/drivers/net/wireless/ath/ath9k/ar9003_phy.c index 04d12252731c..4c9bc9f14f79 100644 --- a/drivers/net/wireless/ath/ath9k/ar9003_phy.c +++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.c | |||
@@ -683,9 +683,6 @@ static int ar9003_hw_process_ini(struct ath_hw *ah, | |||
683 | 683 | ||
684 | REG_WRITE_ARRAY(&ah->iniAdditional, 1, regWrites); | 684 | REG_WRITE_ARRAY(&ah->iniAdditional, 1, regWrites); |
685 | 685 | ||
686 | if (AR_SREV_9462(ah)) | ||
687 | ar9003_hw_prog_ini(ah, &ah->ini_BTCOEX_MAX_TXPWR, 1); | ||
688 | |||
689 | if (chan->channel == 2484) | 686 | if (chan->channel == 2484) |
690 | ar9003_hw_prog_ini(ah, &ah->ini_japan2484, 1); | 687 | ar9003_hw_prog_ini(ah, &ah->ini_japan2484, 1); |
691 | 688 | ||
diff --git a/drivers/net/wireless/ath/ath9k/ar9462_2p0_initvals.h b/drivers/net/wireless/ath/ath9k/ar9462_2p0_initvals.h index b6ba1e8149be..b39870ce3f2e 100644 --- a/drivers/net/wireless/ath/ath9k/ar9462_2p0_initvals.h +++ b/drivers/net/wireless/ath/ath9k/ar9462_2p0_initvals.h | |||
@@ -1448,16 +1448,4 @@ static const u32 ar9462_common_mixed_rx_gain_table_2p0[][2] = { | |||
1448 | {0x0000b1fc, 0x00000196}, | 1448 | {0x0000b1fc, 0x00000196}, |
1449 | }; | 1449 | }; |
1450 | 1450 | ||
1451 | static const u32 ar9462_2p0_BTCOEX_MAX_TXPWR_table[][2] = { | ||
1452 | /* Addr allmodes */ | ||
1453 | {0x000018c0, 0x10101010}, | ||
1454 | {0x000018c4, 0x10101010}, | ||
1455 | {0x000018c8, 0x10101010}, | ||
1456 | {0x000018cc, 0x10101010}, | ||
1457 | {0x000018d0, 0x10101010}, | ||
1458 | {0x000018d4, 0x10101010}, | ||
1459 | {0x000018d8, 0x10101010}, | ||
1460 | {0x000018dc, 0x10101010}, | ||
1461 | }; | ||
1462 | |||
1463 | #endif /* INITVALS_9462_2P0_H */ | 1451 | #endif /* INITVALS_9462_2P0_H */ |