ath9k patches
cover ath9k patches
From: Sujith Manoharan <[email protected]>
This series updates initvals for the AR9003/AR9004 family and also has a few HW code fixes.
AR9300 v2.2
------------
* Update the high_power TX gain table that is used by default for v2.2 cards.
* Handle the Buffalo-specific array via platform_data for the specific device - an OpenWrt patch for WZR-HP-G450H will be sent once the backports package is updated.
AR9331 v1.1/v1.2
-----------------
* Updates for radio/baseband arrays.
These probably require HW code updates (hence the RFC).
AR955x/AR9485/AR9462/AR9565
---------------------------
* Remove a number of duplicates, reducing module size.
DFS
----
* Use DFS-specific baseband parameters when using a DFS channel.
With this series, all the INI files have been updated, verify_checksum shows:
ar9003-2p2 e08640f0fc48a9a2a5f90699bd530123b238b4b1 pass ar9330-1p1 4e08677bf31000d97bcccfbe82b03bbb068376c3 pass ar9330-1p2 688f60aac1986d9c09043c03c3917936dedb48b9 pass ar9340 8817822fa8eeb9cd71f50258fb21dab3078524e7 pass ar9462-1p0 da39a3ee5e6b4b0d3255bfef95601890afd80709 pass ar9485 e73550261601ea10d6bfec752a57fb43bae3cfb4 pass ar955x-1p0 afeaaa07c1833c69642a3a5fc5cbd6b24ce8515b pass ar9565-1p0 d03982594e7e6ef2a7eac0bbe601379580ed3af3 pass ar9580-1p0 1134cdb72d89a643b94ecb6475a7c5e0ddaa1637 pass
All the initval tool changes have been pushed to:
https://github.com/sujith/qca-swiss-army-knife/commits/master
The AR9330 changes were tested on an AP121 and performance was reasonable:
in HT20, RX was about 41 Mbps and TX was 46 Mbps.
Sujith
Sujith Manoharan (16):
ath9k: Add initval arrays for DFS channels
ath9k: Initialize baseband for DFS channels
ath9k: Update mac_postamble for AR9003 family
ath9k: Remove AR955x INI duplicates
ath9k: Update AR9331 v1.1 initvals
ath9k: Update AR9331 v1.2 initvals
ath9k: Use a separate TX gain table for WZR-HP-G450H
ath9k: Update high power gain table for AR9300
ath9k: Identify duplicate AR9485 initvals
ath9k: Identify duplicate AR9462 v2.0 initvals
ath9k: Identify duplicate AR9565 v1.0 initvals
ath9k: Fix regulatory compliance
ath9k: Remove AR9330 v1.0 macro as it's not supported
ath9k: Enable manual peak calibration for AR9331 v1.1
ath9k: Fix internal regulator for AR955x
ath9k: Apply tuning caps for AR9330 and AR9485
.../net/wireless/ath/ath9k/ar9003_2p2_initvals.h | 191 +++--- .../wireless/ath/ath9k/ar9003_buffalo_initvals.h | 126 ++++ drivers/net/wireless/ath/ath9k/ar9003_calib.c | 29 +- drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 4 +- drivers/net/wireless/ath/ath9k/ar9003_hw.c | 18 +- drivers/net/wireless/ath/ath9k/ar9003_phy.c | 6 + drivers/net/wireless/ath/ath9k/ar9003_phy.h | 5 +- .../net/wireless/ath/ath9k/ar9330_1p1_initvals.h | 128 +--- .../net/wireless/ath/ath9k/ar9330_1p2_initvals.h | 401 ++++++++++-- drivers/net/wireless/ath/ath9k/ar9340_initvals.h | 2 + .../net/wireless/ath/ath9k/ar9462_2p0_initvals.h | 697 +++------------------ drivers/net/wireless/ath/ath9k/ar9485_initvals.h | 117 +--- .../net/wireless/ath/ath9k/ar955x_1p0_initvals.h | 540 +--------------- .../net/wireless/ath/ath9k/ar9565_1p0_initvals.h | 85 +-- .../net/wireless/ath/ath9k/ar9580_1p0_initvals.h | 13 +- drivers/net/wireless/ath/ath9k/hw.c | 6 +- drivers/net/wireless/ath/ath9k/hw.h | 2 + drivers/net/wireless/ath/ath9k/init.c | 36 +- drivers/net/wireless/ath/ath9k/reg.h | 3 - include/linux/ath9k_platform.h | 2 + 20 files changed, 776 insertions(+), 1635 deletions(-) create mode 100644 drivers/net/wireless/ath/ath9k/ar9003_buffalo_initvals.h
Signature · 1 line
1.8.4.2
PATCH 1/16 ath9k: Add initval arrays for DFS channels
From: Sujith Manoharan <[email protected]>
--- drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h | 7 +++++++ drivers/net/wireless/ath/ath9k/ar9340_initvals.h | 2 ++ drivers/net/wireless/ath/ath9k/ar9580_1p0_initvals.h | 13 +++++++++++-- 3 files changed, 20 insertions(+), 2 deletions(-)
drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h +7 -0
@@ -1745,4 +1745,11 @@ static const u32 ar9300_2p2_baseband_core_txfir_coeff_japan_2484[][2] = { {0x0000a3a0, 0xca9228ee}, }; +static const u32 ar9300_2p2_baseband_postamble_dfs_channel[][3] = { + /* Addr 5G 2G */ + {0x00009824, 0x5ac668d0, 0x5ac668d0}, + {0x00009e0c, 0x6d4000e2, 0x6d4000e2}, + {0x00009e14, 0x37b9625e, 0x37b9625e}, +}; + #endif /* INITVALS_9003_2P2_H */
drivers/net/wireless/ath/ath9k/ar9340_initvals.h +2 -0
@@ -30,6 +30,8 @@#define ar9340_1p0_baseband_core_txfir_coeff_japan_2484 ar9300_2p2_baseband_core_txfir_coeff_japan_2484 +#define ar9340_1p0_baseband_postamble_dfs_channel ar9300_2p2_baseband_postamble_dfs_channel +static const u32 ar9340_1p0_radio_postamble[][5 ] = {/* Addr 5G_HT20 5G_HT40 2G_HT40 2G_HT20 */ {0x000160ac ,0xa4646800 ,0xa4646800 ,0xa4646800 ,0xa4646800 },
drivers/net/wireless/ath/ath9k/ar9580_1p0_initvals.h +11 -2
@@ -57,8 +57,6 @@ static const u32 ar9580_1p0_baseband_core[][2] = { {0x00009804, 0xfd14e000}, {0x00009808, 0x9c0a9f6b}, {0x0000980c, 0x04900000}, - {0x00009814, 0x3280c00a}, - {0x00009818, 0x00000000}, {0x0000981c, 0x00020028}, {0x00009834, 0x6400a190}, {0x00009838, 0x0108ecff},
@@ -1133,6 +1131,8 @@ static const u32 ar9580_1p0_rx_gain_table[][2] = {static const u32 ar9580_1p0_baseband_postamble[][5 ] = {/* Addr 5G_HT20 5G_HT40 2G_HT40 2G_HT20 */ {0x00009810 ,0xd00a8005 ,0xd00a8005 ,0xd00a8011 ,0xd00a8011 }, + {0x00009814 ,0x3280c00a ,0x3280c00a ,0x3280c00a ,0x3280c00a }, + {0x00009818 ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, {0x00009820 ,0x206a022e ,0x206a022e ,0x206a012e ,0x206a012e }, {0x00009824 ,0x5ac640d0 ,0x5ac640d0 ,0x5ac640d0 ,0x5ac640d0 }, {0x00009828 ,0x06903081 ,0x06903081 ,0x06903881 ,0x06903881 },
@@ -1207,4 +1207,13 @@ static const u32 ar9580_1p0_pcie_phy_pll_on_clkreq[][2] = { {0x00004044, 0x00000000}, }; +static const u32 ar9580_1p0_baseband_postamble_dfs_channel[][3] = { + /* Addr 5G 2G */ + {0x00009814, 0x3400c00f, 0x3400c00f}, + {0x00009824, 0x5ac668d0, 0x5ac668d0}, + {0x00009828, 0x06903080, 0x06903080}, + {0x00009e0c, 0x6d4000e2, 0x6d4000e2}, + {0x00009e14, 0x37b9625e, 0x37b9625e}, +}; + #endif /* INITVALS_9580_1P0_H */
Signature · 1 line
1.8.4.2
PATCH 2/16 ath9k: Initialize baseband for DFS channels
In reply to Sujith ManoharanFrom: Sujith Manoharan <[email protected]>
Certain baseband registers require different values to be programmed when operating in a DFS channel to ensure that radar detection works correctly. This is required for AR9300, AR9340 and AR9580.
--- drivers/net/wireless/ath/ath9k/ar9003_hw.c | 6 ++++++ drivers/net/wireless/ath/ath9k/ar9003_phy.c | 6 ++++++ drivers/net/wireless/ath/ath9k/hw.h | 1 + 3 files changed, 13 insertions(+)
drivers/net/wireless/ath/ath9k/ar9003_hw.c +6 -0
@@ -152,6 +152,8 @@ static void ar9003_hw_init_mode_regs(struct ath_hw *ah) ar9340Modes_fast_clock_1p0);INIT_INI_ARRAY (&ah->iniCckfirJapan2484, ar9340_1p0_baseband_core_txfir_coeff_japan_2484); +INIT_INI_ARRAY (&ah->ini_dfs, + ar9340_1p0_baseband_postamble_dfs_channel);if (!ah->is_clk_25mhz) INIT_INI_ARRAY(&ah->iniAdditional,
@@ -340,6 +342,8 @@ static void ar9003_hw_init_mode_regs(struct ath_hw *ah) ar9580_1p0_modes_fast_clock);INIT_INI_ARRAY (&ah->iniCckfirJapan2484, ar9580_1p0_baseband_core_txfir_coeff_japan_2484); +INIT_INI_ARRAY (&ah->ini_dfs, + ar9580_1p0_baseband_postamble_dfs_channel); }else if (AR_SREV_9565_11_OR_LATER (ah)) {INIT_INI_ARRAY (&ah->iniMac[ATH_INI_CORE ], ar9565_1p1_mac_core);
@@ -458,6 +462,8 @@ static void ar9003_hw_init_mode_regs(struct ath_hw *ah) ar9300Modes_fast_clock_2p2);INIT_INI_ARRAY (&ah->iniCckfirJapan2484, ar9300_2p2_baseband_core_txfir_coeff_japan_2484); +INIT_INI_ARRAY (&ah->ini_dfs, + ar9300_2p2_baseband_postamble_dfs_channel); } }
drivers/net/wireless/ath/ath9k/ar9003_phy.c +6 -0
@@ -1332,6 +1332,7 @@ static void ar9003_hw_ani_cache_ini_regs(struct ath_hw *ah)static void ar9003_hw_set_radar_params (struct ath_hw *ah,struct ath_hw_radar_conf *conf) { +unsigned int regWrites =0 ;u32 radar_0 =0 , radar_1 =0 ;if (!conf) {
@@ -1358,6 +1359,11 @@ static void ar9003_hw_set_radar_params(struct ath_hw *ah,REG_SET_BIT (ah,AR_PHY_RADAR_EXT ,AR_PHY_RADAR_EXT_ENA ); elseREG_CLR_BIT (ah ,AR_PHY_RADAR_EXT ,AR_PHY_RADAR_EXT_ENA ); + +if (AR_SREV_9300 (ah) ||AR_SREV_9340 (ah) ||AR_SREV_9580 (ah)) { +REG_WRITE_ARRAY (&ah->ini_dfs, +IS_CHAN_HT40 (ah->curchan) ?2 :1 , regWrites); + } }static void ar9003_hw_set_radar_conf (struct ath_hw *ah)
drivers/net/wireless/ath/ath9k/hw.h +1 -0
@@ -864,6 +864,7 @@ struct ath_hw {u32 gpio_mask;u32 gpio_val; +struct ar5416IniArray ini_dfs;struct ar5416IniArray iniModes;struct ar5416IniArray iniCommon;struct ar5416IniArray iniBB_RfGain;
Signature · 1 line
1.8.4.2
PATCH 3/16 ath9k: Update mac_postamble for AR9003 family
In reply to Sujith ManoharanFrom: Sujith Manoharan <[email protected]>
Enable the ALWAYS_KEYSEARCH bit in the initvals. Currently this is done in the driver, but adding this to the initvals makes it easier to be in sync with the INI files given by the systems engineering team.
--- drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h +1 -1
@@ -303,7 +303,7 @@ static const u32 ar9300_2p2_mac_postamble[][5] = { {0x000010b0, 0x00000e60, 0x00001cc0, 0x00007c70, 0x00003e38}, {0x00008014, 0x03e803e8, 0x07d007d0, 0x10801600, 0x08400b00}, {0x0000801c, 0x128d8027, 0x128d804f, 0x12e00057, 0x12e0002b}, - {0x00008120, 0x08f04800, 0x08f04800, 0x08f04810, 0x08f04810}, + {0x00008120, 0x18f04800, 0x18f04800, 0x18f04810, 0x18f04810}, {0x000081d0, 0x00003210, 0x00003210, 0x0000320a, 0x0000320a}, {0x00008318, 0x00003e80, 0x00007d00, 0x00006880, 0x00003440}, };
Signature · 1 line
1.8.4.2
PATCH 4/16 ath9k: Remove AR955x INI duplicates
In reply to Sujith ManoharanFrom: Sujith Manoharan <[email protected]>
--- .../net/wireless/ath/ath9k/ar955x_1p0_initvals.h | 540 +-------------------- 1 file changed, 8 insertions(+), 532 deletions(-)
drivers/net/wireless/ath/ath9k/ar955x_1p0_initvals.h +8 -532
@@ -20,6 +20,14 @@/* AR955X 1.0 */ +#define ar955x_1p0_soc_postamble ar9300_2p2_soc_postamble + +#define ar955x_1p0_common_rx_gain_table ar9300Common_rx_gain_table_2p2 + +#define ar955x_1p0_common_wo_xlna_rx_gain_table ar9300Common_wo_xlna_rx_gain_table_2p2 + +#define ar955x_1p0_baseband_core_txfir_coeff_japan_2484 ar9300_2p2_baseband_core_txfir_coeff_japan_2484 +static const u32 ar955x_1p0_radio_postamble[][5 ] = {/* Addr 5G_HT20 5G_HT40 2G_HT40 2G_HT20 */ {0x00016098 ,0xd2dd5554 ,0xd2dd5554 ,0xd28b3330 ,0xd28b3330 },
@@ -37,13 +45,6 @@ static const u32 ar955x_1p0_radio_postamble[][5] = { {0x00016940, 0x10804008, 0x10804008, 0x10804008, 0x10804008}, }; -static const u32 ar955x_1p0_baseband_core_txfir_coeff_japan_2484[][2 ] = { -/* Addr allmodes */ - {0x0000a398 ,0x00000000 }, - {0x0000a39c ,0x6f7f0301 }, - {0x0000a3a0 ,0xca9228ee }, -}; -static const u32 ar955x_1p0_baseband_postamble[][5 ] = {/* Addr 5G_HT20 5G_HT40 2G_HT40 2G_HT20 */ {0x00009810, 0xd00a8005, 0xd00a8005, 0xd00a8011, 0xd00a8011},
@@ -473,266 +474,6 @@ static const u32 ar955x_1p0_mac_core[][2] = { {0x000083d0, 0x8c7901ff}, }; -static const u32 ar955x_1p0_common_rx_gain_table[][2 ] = { -/* Addr allmodes */ - {0x0000a000 ,0x00010000 }, - {0x0000a004 ,0x00030002 }, - {0x0000a008 ,0x00050004 }, - {0x0000a00c ,0x00810080 }, - {0x0000a010 ,0x00830082 }, - {0x0000a014 ,0x01810180 }, - {0x0000a018 ,0x01830182 }, - {0x0000a01c ,0x01850184 }, - {0x0000a020 ,0x01890188 }, - {0x0000a024 ,0x018b018a }, - {0x0000a028 ,0x018d018c }, - {0x0000a02c ,0x01910190 }, - {0x0000a030 ,0x01930192 }, - {0x0000a034 ,0x01950194 }, - {0x0000a038 ,0x038a0196 }, - {0x0000a03c ,0x038c038b }, - {0x0000a040 ,0x0390038d }, - {0x0000a044 ,0x03920391 }, - {0x0000a048 ,0x03940393 }, - {0x0000a04c ,0x03960395 }, - {0x0000a050 ,0x00000000 }, - {0x0000a054 ,0x00000000 }, - {0x0000a058 ,0x00000000 }, - {0x0000a05c ,0x00000000 }, - {0x0000a060 ,0x00000000 }, - {0x0000a064 ,0x00000000 }, - {0x0000a068 ,0x00000000 }, - {0x0000a06c ,0x00000000 }, - {0x0000a070 ,0x00000000 }, - {0x0000a074 ,0x00000000 }, - {0x0000a078 ,0x00000000 }, - {0x0000a07c ,0x00000000 }, - {0x0000a080 ,0x22222229 }, - {0x0000a084 ,0x1d1d1d1d }, - {0x0000a088 ,0x1d1d1d1d }, - {0x0000a08c ,0x1d1d1d1d }, - {0x0000a090 ,0x171d1d1d }, - {0x0000a094 ,0x11111717 }, - {0x0000a098 ,0x00030311 }, - {0x0000a09c ,0x00000000 }, - {0x0000a0a0 ,0x00000000 }, - {0x0000a0a4 ,0x00000000 }, - {0x0000a0a8 ,0x00000000 }, - {0x0000a0ac ,0x00000000 }, - {0x0000a0b0 ,0x00000000 }, - {0x0000a0b4 ,0x00000000 }, - {0x0000a0b8 ,0x00000000 }, - {0x0000a0bc ,0x00000000 }, - {0x0000a0c0 ,0x001f0000 }, - {0x0000a0c4 ,0x01000101 }, - {0x0000a0c8 ,0x011e011f }, - {0x0000a0cc ,0x011c011d }, - {0x0000a0d0 ,0x02030204 }, - {0x0000a0d4 ,0x02010202 }, - {0x0000a0d8 ,0x021f0200 }, - {0x0000a0dc ,0x0302021e }, - {0x0000a0e0 ,0x03000301 }, - {0x0000a0e4 ,0x031e031f }, - {0x0000a0e8 ,0x0402031d }, - {0x0000a0ec ,0x04000401 }, - {0x0000a0f0 ,0x041e041f }, - {0x0000a0f4 ,0x0502041d }, - {0x0000a0f8 ,0x05000501 }, - {0x0000a0fc ,0x051e051f }, - {0x0000a100 ,0x06010602 }, - {0x0000a104 ,0x061f0600 }, - {0x0000a108 ,0x061d061e }, - {0x0000a10c ,0x07020703 }, - {0x0000a110 ,0x07000701 }, - {0x0000a114 ,0x00000000 }, - {0x0000a118 ,0x00000000 }, - {0x0000a11c ,0x00000000 }, - {0x0000a120 ,0x00000000 }, - {0x0000a124 ,0x00000000 }, - {0x0000a128 ,0x00000000 }, - {0x0000a12c ,0x00000000 }, - {0x0000a130 ,0x00000000 }, - {0x0000a134 ,0x00000000 }, - {0x0000a138 ,0x00000000 }, - {0x0000a13c ,0x00000000 }, - {0x0000a140 ,0x001f0000 }, - {0x0000a144 ,0x01000101 }, - {0x0000a148 ,0x011e011f }, - {0x0000a14c ,0x011c011d }, - {0x0000a150 ,0x02030204 }, - {0x0000a154 ,0x02010202 }, - {0x0000a158 ,0x021f0200 }, - {0x0000a15c ,0x0302021e }, - {0x0000a160 ,0x03000301 }, - {0x0000a164 ,0x031e031f }, - {0x0000a168 ,0x0402031d }, - {0x0000a16c ,0x04000401 }, - {0x0000a170 ,0x041e041f }, - {0x0000a174 ,0x0502041d }, - {0x0000a178 ,0x05000501 }, - {0x0000a17c ,0x051e051f }, - {0x0000a180 ,0x06010602 }, - {0x0000a184 ,0x061f0600 }, - {0x0000a188 ,0x061d061e }, - {0x0000a18c ,0x07020703 }, - {0x0000a190 ,0x07000701 }, - {0x0000a194 ,0x00000000 }, - {0x0000a198 ,0x00000000 }, - {0x0000a19c ,0x00000000 }, - {0x0000a1a0 ,0x00000000 }, - {0x0000a1a4 ,0x00000000 }, - {0x0000a1a8 ,0x00000000 }, - {0x0000a1ac ,0x00000000 }, - {0x0000a1b0 ,0x00000000 }, - {0x0000a1b4 ,0x00000000 }, - {0x0000a1b8 ,0x00000000 }, - {0x0000a1bc ,0x00000000 }, - {0x0000a1c0 ,0x00000000 }, - {0x0000a1c4 ,0x00000000 }, - {0x0000a1c8 ,0x00000000 }, - {0x0000a1cc ,0x00000000 }, - {0x0000a1d0 ,0x00000000 }, - {0x0000a1d4 ,0x00000000 }, - {0x0000a1d8 ,0x00000000 }, - {0x0000a1dc ,0x00000000 }, - {0x0000a1e0 ,0x00000000 }, - {0x0000a1e4 ,0x00000000 }, - {0x0000a1e8 ,0x00000000 }, - {0x0000a1ec ,0x00000000 }, - {0x0000a1f0 ,0x00000396 }, - {0x0000a1f4 ,0x00000396 }, - {0x0000a1f8 ,0x00000396 }, - {0x0000a1fc ,0x00000196 }, - {0x0000b000 ,0x00010000 }, - {0x0000b004 ,0x00030002 }, - {0x0000b008 ,0x00050004 }, - {0x0000b00c ,0x00810080 }, - {0x0000b010 ,0x00830082 }, - {0x0000b014 ,0x01810180 }, - {0x0000b018 ,0x01830182 }, - {0x0000b01c ,0x01850184 }, - {0x0000b020 ,0x02810280 }, - {0x0000b024 ,0x02830282 }, - {0x0000b028 ,0x02850284 }, - {0x0000b02c ,0x02890288 }, - {0x0000b030 ,0x028b028a }, - {0x0000b034 ,0x0388028c }, - {0x0000b038 ,0x038a0389 }, - {0x0000b03c ,0x038c038b }, - {0x0000b040 ,0x0390038d }, - {0x0000b044 ,0x03920391 }, - {0x0000b048 ,0x03940393 }, - {0x0000b04c ,0x03960395 }, - {0x0000b050 ,0x00000000 }, - {0x0000b054 ,0x00000000 }, - {0x0000b058 ,0x00000000 }, - {0x0000b05c ,0x00000000 }, - {0x0000b060 ,0x00000000 }, - {0x0000b064 ,0x00000000 }, - {0x0000b068 ,0x00000000 }, - {0x0000b06c ,0x00000000 }, - {0x0000b070 ,0x00000000 }, - {0x0000b074 ,0x00000000 }, - {0x0000b078 ,0x00000000 }, - {0x0000b07c ,0x00000000 }, - {0x0000b080 ,0x23232323 }, - {0x0000b084 ,0x21232323 }, - {0x0000b088 ,0x19191c1e }, - {0x0000b08c ,0x12141417 }, - {0x0000b090 ,0x07070e0e }, - {0x0000b094 ,0x03030305 }, - {0x0000b098 ,0x00000003 }, - {0x0000b09c ,0x00000000 }, - {0x0000b0a0 ,0x00000000 }, - {0x0000b0a4 ,0x00000000 }, - {0x0000b0a8 ,0x00000000 }, - {0x0000b0ac ,0x00000000 }, - {0x0000b0b0 ,0x00000000 }, - {0x0000b0b4 ,0x00000000 }, - {0x0000b0b8 ,0x00000000 }, - {0x0000b0bc ,0x00000000 }, - {0x0000b0c0 ,0x003f0020 }, - {0x0000b0c4 ,0x00400041 }, - {0x0000b0c8 ,0x0140005f }, - {0x0000b0cc ,0x0160015f }, - {0x0000b0d0 ,0x017e017f }, - {0x0000b0d4 ,0x02410242 }, - {0x0000b0d8 ,0x025f0240 }, - {0x0000b0dc ,0x027f0260 }, - {0x0000b0e0 ,0x0341027e }, - {0x0000b0e4 ,0x035f0340 }, - {0x0000b0e8 ,0x037f0360 }, - {0x0000b0ec ,0x04400441 }, - {0x0000b0f0 ,0x0460045f }, - {0x0000b0f4 ,0x0541047f }, - {0x0000b0f8 ,0x055f0540 }, - {0x0000b0fc ,0x057f0560 }, - {0x0000b100 ,0x06400641 }, - {0x0000b104 ,0x0660065f }, - {0x0000b108 ,0x067e067f }, - {0x0000b10c ,0x07410742 }, - {0x0000b110 ,0x075f0740 }, - {0x0000b114 ,0x077f0760 }, - {0x0000b118 ,0x07800781 }, - {0x0000b11c ,0x07a0079f }, - {0x0000b120 ,0x07c107bf }, - {0x0000b124 ,0x000007c0 }, - {0x0000b128 ,0x00000000 }, - {0x0000b12c ,0x00000000 }, - {0x0000b130 ,0x00000000 }, - {0x0000b134 ,0x00000000 }, - {0x0000b138 ,0x00000000 }, - {0x0000b13c ,0x00000000 }, - {0x0000b140 ,0x003f0020 }, - {0x0000b144 ,0x00400041 }, - {0x0000b148 ,0x0140005f }, - {0x0000b14c ,0x0160015f }, - {0x0000b150 ,0x017e017f }, - {0x0000b154 ,0x02410242 }, - {0x0000b158 ,0x025f0240 }, - {0x0000b15c ,0x027f0260 }, - {0x0000b160 ,0x0341027e }, - {0x0000b164 ,0x035f0340 }, - {0x0000b168 ,0x037f0360 }, - {0x0000b16c ,0x04400441 }, - {0x0000b170 ,0x0460045f }, - {0x0000b174 ,0x0541047f }, - {0x0000b178 ,0x055f0540 }, - {0x0000b17c ,0x057f0560 }, - {0x0000b180 ,0x06400641 }, - {0x0000b184 ,0x0660065f }, - {0x0000b188 ,0x067e067f }, - {0x0000b18c ,0x07410742 }, - {0x0000b190 ,0x075f0740 }, - {0x0000b194 ,0x077f0760 }, - {0x0000b198 ,0x07800781 }, - {0x0000b19c ,0x07a0079f }, - {0x0000b1a0 ,0x07c107bf }, - {0x0000b1a4 ,0x000007c0 }, - {0x0000b1a8 ,0x00000000 }, - {0x0000b1ac ,0x00000000 }, - {0x0000b1b0 ,0x00000000 }, - {0x0000b1b4 ,0x00000000 }, - {0x0000b1b8 ,0x00000000 }, - {0x0000b1bc ,0x00000000 }, - {0x0000b1c0 ,0x00000000 }, - {0x0000b1c4 ,0x00000000 }, - {0x0000b1c8 ,0x00000000 }, - {0x0000b1cc ,0x00000000 }, - {0x0000b1d0 ,0x00000000 }, - {0x0000b1d4 ,0x00000000 }, - {0x0000b1d8 ,0x00000000 }, - {0x0000b1dc ,0x00000000 }, - {0x0000b1e0 ,0x00000000 }, - {0x0000b1e4 ,0x00000000 }, - {0x0000b1e8 ,0x00000000 }, - {0x0000b1ec ,0x00000000 }, - {0x0000b1f0 ,0x00000396 }, - {0x0000b1f4 ,0x00000396 }, - {0x0000b1f8 ,0x00000396 }, - {0x0000b1fc ,0x00000196 }, -}; -static const u32 ar955x_1p0_baseband_core[][2 ] = {/* Addr allmodes */ {0x00009800, 0xafe68e30},
@@ -891,266 +632,6 @@ static const u32 ar955x_1p0_baseband_core[][2] = { {0x0000c420, 0x00000000}, }; -static const u32 ar955x_1p0_common_wo_xlna_rx_gain_table[][2 ] = { -/* Addr allmodes */ - {0x0000a000 ,0x00010000 }, - {0x0000a004 ,0x00030002 }, - {0x0000a008 ,0x00050004 }, - {0x0000a00c ,0x00810080 }, - {0x0000a010 ,0x00830082 }, - {0x0000a014 ,0x01810180 }, - {0x0000a018 ,0x01830182 }, - {0x0000a01c ,0x01850184 }, - {0x0000a020 ,0x01890188 }, - {0x0000a024 ,0x018b018a }, - {0x0000a028 ,0x018d018c }, - {0x0000a02c ,0x03820190 }, - {0x0000a030 ,0x03840383 }, - {0x0000a034 ,0x03880385 }, - {0x0000a038 ,0x038a0389 }, - {0x0000a03c ,0x038c038b }, - {0x0000a040 ,0x0390038d }, - {0x0000a044 ,0x03920391 }, - {0x0000a048 ,0x03940393 }, - {0x0000a04c ,0x03960395 }, - {0x0000a050 ,0x00000000 }, - {0x0000a054 ,0x00000000 }, - {0x0000a058 ,0x00000000 }, - {0x0000a05c ,0x00000000 }, - {0x0000a060 ,0x00000000 }, - {0x0000a064 ,0x00000000 }, - {0x0000a068 ,0x00000000 }, - {0x0000a06c ,0x00000000 }, - {0x0000a070 ,0x00000000 }, - {0x0000a074 ,0x00000000 }, - {0x0000a078 ,0x00000000 }, - {0x0000a07c ,0x00000000 }, - {0x0000a080 ,0x29292929 }, - {0x0000a084 ,0x29292929 }, - {0x0000a088 ,0x29292929 }, - {0x0000a08c ,0x29292929 }, - {0x0000a090 ,0x22292929 }, - {0x0000a094 ,0x1d1d2222 }, - {0x0000a098 ,0x0c111117 }, - {0x0000a09c ,0x00030303 }, - {0x0000a0a0 ,0x00000000 }, - {0x0000a0a4 ,0x00000000 }, - {0x0000a0a8 ,0x00000000 }, - {0x0000a0ac ,0x00000000 }, - {0x0000a0b0 ,0x00000000 }, - {0x0000a0b4 ,0x00000000 }, - {0x0000a0b8 ,0x00000000 }, - {0x0000a0bc ,0x00000000 }, - {0x0000a0c0 ,0x001f0000 }, - {0x0000a0c4 ,0x01000101 }, - {0x0000a0c8 ,0x011e011f }, - {0x0000a0cc ,0x011c011d }, - {0x0000a0d0 ,0x02030204 }, - {0x0000a0d4 ,0x02010202 }, - {0x0000a0d8 ,0x021f0200 }, - {0x0000a0dc ,0x0302021e }, - {0x0000a0e0 ,0x03000301 }, - {0x0000a0e4 ,0x031e031f }, - {0x0000a0e8 ,0x0402031d }, - {0x0000a0ec ,0x04000401 }, - {0x0000a0f0 ,0x041e041f }, - {0x0000a0f4 ,0x0502041d }, - {0x0000a0f8 ,0x05000501 }, - {0x0000a0fc ,0x051e051f }, - {0x0000a100 ,0x06010602 }, - {0x0000a104 ,0x061f0600 }, - {0x0000a108 ,0x061d061e }, - {0x0000a10c ,0x07020703 }, - {0x0000a110 ,0x07000701 }, - {0x0000a114 ,0x00000000 }, - {0x0000a118 ,0x00000000 }, - {0x0000a11c ,0x00000000 }, - {0x0000a120 ,0x00000000 }, - {0x0000a124 ,0x00000000 }, - {0x0000a128 ,0x00000000 }, - {0x0000a12c ,0x00000000 }, - {0x0000a130 ,0x00000000 }, - {0x0000a134 ,0x00000000 }, - {0x0000a138 ,0x00000000 }, - {0x0000a13c ,0x00000000 }, - {0x0000a140 ,0x001f0000 }, - {0x0000a144 ,0x01000101 }, - {0x0000a148 ,0x011e011f }, - {0x0000a14c ,0x011c011d }, - {0x0000a150 ,0x02030204 }, - {0x0000a154 ,0x02010202 }, - {0x0000a158 ,0x021f0200 }, - {0x0000a15c ,0x0302021e }, - {0x0000a160 ,0x03000301 }, - {0x0000a164 ,0x031e031f }, - {0x0000a168 ,0x0402031d }, - {0x0000a16c ,0x04000401 }, - {0x0000a170 ,0x041e041f }, - {0x0000a174 ,0x0502041d }, - {0x0000a178 ,0x05000501 }, - {0x0000a17c ,0x051e051f }, - {0x0000a180 ,0x06010602 }, - {0x0000a184 ,0x061f0600 }, - {0x0000a188 ,0x061d061e }, - {0x0000a18c ,0x07020703 }, - {0x0000a190 ,0x07000701 }, - {0x0000a194 ,0x00000000 }, - {0x0000a198 ,0x00000000 }, - {0x0000a19c ,0x00000000 }, - {0x0000a1a0 ,0x00000000 }, - {0x0000a1a4 ,0x00000000 }, - {0x0000a1a8 ,0x00000000 }, - {0x0000a1ac ,0x00000000 }, - {0x0000a1b0 ,0x00000000 }, - {0x0000a1b4 ,0x00000000 }, - {0x0000a1b8 ,0x00000000 }, - {0x0000a1bc ,0x00000000 }, - {0x0000a1c0 ,0x00000000 }, - {0x0000a1c4 ,0x00000000 }, - {0x0000a1c8 ,0x00000000 }, - {0x0000a1cc ,0x00000000 }, - {0x0000a1d0 ,0x00000000 }, - {0x0000a1d4 ,0x00000000 }, - {0x0000a1d8 ,0x00000000 }, - {0x0000a1dc ,0x00000000 }, - {0x0000a1e0 ,0x00000000 }, - {0x0000a1e4 ,0x00000000 }, - {0x0000a1e8 ,0x00000000 }, - {0x0000a1ec ,0x00000000 }, - {0x0000a1f0 ,0x00000396 }, - {0x0000a1f4 ,0x00000396 }, - {0x0000a1f8 ,0x00000396 }, - {0x0000a1fc ,0x00000196 }, - {0x0000b000 ,0x00010000 }, - {0x0000b004 ,0x00030002 }, - {0x0000b008 ,0x00050004 }, - {0x0000b00c ,0x00810080 }, - {0x0000b010 ,0x00830082 }, - {0x0000b014 ,0x01810180 }, - {0x0000b018 ,0x01830182 }, - {0x0000b01c ,0x01850184 }, - {0x0000b020 ,0x02810280 }, - {0x0000b024 ,0x02830282 }, - {0x0000b028 ,0x02850284 }, - {0x0000b02c ,0x02890288 }, - {0x0000b030 ,0x028b028a }, - {0x0000b034 ,0x0388028c }, - {0x0000b038 ,0x038a0389 }, - {0x0000b03c ,0x038c038b }, - {0x0000b040 ,0x0390038d }, - {0x0000b044 ,0x03920391 }, - {0x0000b048 ,0x03940393 }, - {0x0000b04c ,0x03960395 }, - {0x0000b050 ,0x00000000 }, - {0x0000b054 ,0x00000000 }, - {0x0000b058 ,0x00000000 }, - {0x0000b05c ,0x00000000 }, - {0x0000b060 ,0x00000000 }, - {0x0000b064 ,0x00000000 }, - {0x0000b068 ,0x00000000 }, - {0x0000b06c ,0x00000000 }, - {0x0000b070 ,0x00000000 }, - {0x0000b074 ,0x00000000 }, - {0x0000b078 ,0x00000000 }, - {0x0000b07c ,0x00000000 }, - {0x0000b080 ,0x32323232 }, - {0x0000b084 ,0x2f2f3232 }, - {0x0000b088 ,0x23282a2d }, - {0x0000b08c ,0x1c1e2123 }, - {0x0000b090 ,0x14171919 }, - {0x0000b094 ,0x0e0e1214 }, - {0x0000b098 ,0x03050707 }, - {0x0000b09c ,0x00030303 }, - {0x0000b0a0 ,0x00000000 }, - {0x0000b0a4 ,0x00000000 }, - {0x0000b0a8 ,0x00000000 }, - {0x0000b0ac ,0x00000000 }, - {0x0000b0b0 ,0x00000000 }, - {0x0000b0b4 ,0x00000000 }, - {0x0000b0b8 ,0x00000000 }, - {0x0000b0bc ,0x00000000 }, - {0x0000b0c0 ,0x003f0020 }, - {0x0000b0c4 ,0x00400041 }, - {0x0000b0c8 ,0x0140005f }, - {0x0000b0cc ,0x0160015f }, - {0x0000b0d0 ,0x017e017f }, - {0x0000b0d4 ,0x02410242 }, - {0x0000b0d8 ,0x025f0240 }, - {0x0000b0dc ,0x027f0260 }, - {0x0000b0e0 ,0x0341027e }, - {0x0000b0e4 ,0x035f0340 }, - {0x0000b0e8 ,0x037f0360 }, - {0x0000b0ec ,0x04400441 }, - {0x0000b0f0 ,0x0460045f }, - {0x0000b0f4 ,0x0541047f }, - {0x0000b0f8 ,0x055f0540 }, - {0x0000b0fc ,0x057f0560 }, - {0x0000b100 ,0x06400641 }, - {0x0000b104 ,0x0660065f }, - {0x0000b108 ,0x067e067f }, - {0x0000b10c ,0x07410742 }, - {0x0000b110 ,0x075f0740 }, - {0x0000b114 ,0x077f0760 }, - {0x0000b118 ,0x07800781 }, - {0x0000b11c ,0x07a0079f }, - {0x0000b120 ,0x07c107bf }, - {0x0000b124 ,0x000007c0 }, - {0x0000b128 ,0x00000000 }, - {0x0000b12c ,0x00000000 }, - {0x0000b130 ,0x00000000 }, - {0x0000b134 ,0x00000000 }, - {0x0000b138 ,0x00000000 }, - {0x0000b13c ,0x00000000 }, - {0x0000b140 ,0x003f0020 }, - {0x0000b144 ,0x00400041 }, - {0x0000b148 ,0x0140005f }, - {0x0000b14c ,0x0160015f }, - {0x0000b150 ,0x017e017f }, - {0x0000b154 ,0x02410242 }, - {0x0000b158 ,0x025f0240 }, - {0x0000b15c ,0x027f0260 }, - {0x0000b160 ,0x0341027e }, - {0x0000b164 ,0x035f0340 }, - {0x0000b168 ,0x037f0360 }, - {0x0000b16c ,0x04400441 }, - {0x0000b170 ,0x0460045f }, - {0x0000b174 ,0x0541047f }, - {0x0000b178 ,0x055f0540 }, - {0x0000b17c ,0x057f0560 }, - {0x0000b180 ,0x06400641 }, - {0x0000b184 ,0x0660065f }, - {0x0000b188 ,0x067e067f }, - {0x0000b18c ,0x07410742 }, - {0x0000b190 ,0x075f0740 }, - {0x0000b194 ,0x077f0760 }, - {0x0000b198 ,0x07800781 }, - {0x0000b19c ,0x07a0079f }, - {0x0000b1a0 ,0x07c107bf }, - {0x0000b1a4 ,0x000007c0 }, - {0x0000b1a8 ,0x00000000 }, - {0x0000b1ac ,0x00000000 }, - {0x0000b1b0 ,0x00000000 }, - {0x0000b1b4 ,0x00000000 }, - {0x0000b1b8 ,0x00000000 }, - {0x0000b1bc ,0x00000000 }, - {0x0000b1c0 ,0x00000000 }, - {0x0000b1c4 ,0x00000000 }, - {0x0000b1c8 ,0x00000000 }, - {0x0000b1cc ,0x00000000 }, - {0x0000b1d0 ,0x00000000 }, - {0x0000b1d4 ,0x00000000 }, - {0x0000b1d8 ,0x00000000 }, - {0x0000b1dc ,0x00000000 }, - {0x0000b1e0 ,0x00000000 }, - {0x0000b1e4 ,0x00000000 }, - {0x0000b1e8 ,0x00000000 }, - {0x0000b1ec ,0x00000000 }, - {0x0000b1f0 ,0x00000396 }, - {0x0000b1f4 ,0x00000396 }, - {0x0000b1f8 ,0x00000396 }, - {0x0000b1fc ,0x00000196 }, -}; -static const u32 ar955x_1p0_soc_preamble[][2 ] = {/* Addr allmodes */ {0x00007000, 0x00000000},
@@ -1263,11 +744,6 @@ static const u32 ar955x_1p0_modes_no_xpa_tx_gain_table[][9] = { {0x00016848, 0x66482401, 0x66482401, 0x66482401, 0x66482401, 0x66482401, 0x66482401, 0x66482401, 0x66482401}, }; -static const u32 ar955x_1p0_soc_postamble[][5 ] = { -/* Addr 5G_HT20 5G_HT40 2G_HT40 2G_HT20 */ - {0x00007010 ,0x00000023 ,0x00000023 ,0x00000023 ,0x00000023 }, -}; -static const u32 ar955x_1p0_modes_fast_clock[][3 ] = {/* Addr 5G_HT20 5G_HT40 */ {0x00001030, 0x00000268, 0x000004d0},
Signature · 1 line
1.8.4.2
PATCH 5/16 ath9k: Update AR9331 v1.1 initvals
In reply to Sujith ManoharanFrom: Sujith Manoharan <[email protected]>
* Update radio/baseband/gain tables.
* Mark ar9331_modes_high_power_tx_gain_1p1 as a duplicate
* ar9331_1p1_mac_postamble is not a duplicate.
--- .../net/wireless/ath/ath9k/ar9330_1p1_initvals.h | 128 ++++----------------- 1 file changed, 24 insertions(+), 104 deletions(-)
drivers/net/wireless/ath/ath9k/ar9330_1p1_initvals.h +24 -104
@@ -18,6 +18,10 @@#ifndef INITVALS_9330_1P1_H #define INITVALS_9330_1P1_H +#define ar9331_1p1_baseband_core_txfir_coeff_japan_2484 ar9300_2p2_baseband_core_txfir_coeff_japan_2484 + +#define ar9331_modes_high_power_tx_gain_1p1 ar9331_modes_lowest_ob_db_tx_gain_1p1 +static const u32 ar9331_1p1_baseband_postamble[][5 ] = {/* Addr 5G_HT20 5G_HT40 2G_HT40 2G_HT20 */ {0x00009810, 0xd00a8005, 0xd00a8005, 0xd00a8005, 0xd00a8005},
@@ -55,7 +59,7 @@ static const u32 ar9331_1p1_baseband_postamble[][5] = { {0x0000a284, 0x00000000, 0x00000000, 0x00000000, 0x00000000}, {0x0000a288, 0x00000000, 0x00000000, 0x00000000, 0x00000000}, {0x0000a28c, 0x00000000, 0x00000000, 0x00000000, 0x00000000}, - {0x0000a2c4, 0x00158d18, 0x00158d18, 0x00158d18, 0x00158d18}, + {0x0000a2c4, 0x00158d18, 0x00158d18, 0x00058d18, 0x00058d18}, {0x0000a2d0, 0x00071982, 0x00071982, 0x00071982, 0x00071982}, {0x0000a2d8, 0xf999a83a, 0xf999a83a, 0xf999a83a, 0xf999a83a}, {0x0000a358, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
@@ -252,7 +256,7 @@ static const u32 ar9331_modes_low_ob_db_tx_gain_1p1[][5] = { {0x0000a2e0, 0xffffcc84, 0xffffcc84, 0xffffcc84, 0xffffcc84}, {0x0000a2e4, 0xfffff000, 0xfffff000, 0xfffff000, 0xfffff000}, {0x0000a2e8, 0xfffe0000, 0xfffe0000, 0xfffe0000, 0xfffe0000}, - {0x0000a410, 0x000050d7, 0x000050d7, 0x000050d0, 0x000050d0}, + {0x0000a410, 0x000050d7, 0x000050d7, 0x000050d4, 0x000050d4}, {0x0000a500, 0x00022200, 0x00022200, 0x00000000, 0x00000000}, {0x0000a504, 0x05062002, 0x05062002, 0x04000002, 0x04000002}, {0x0000a508, 0x0c002e00, 0x0c002e00, 0x08000004, 0x08000004},
@@ -337,8 +341,6 @@ static const u32 ar9331_modes_low_ob_db_tx_gain_1p1[][5] = { {0x00016284, 0x14d3f000, 0x14d3f000, 0x14d3f000, 0x14d3f000}, }; -#define ar9331_1p1_baseband_core_txfir_coeff_japan_2484 ar9462_2p0_baseband_core_txfir_coeff_japan_2484 -static const u32 ar9331_1p1_xtal_25M[][2 ] = {/* Addr allmodes */ {0x00007038, 0x000002f8},
@@ -373,17 +375,17 @@ static const u32 ar9331_1p1_radio_core[][2] = { {0x000160b4, 0x92480040}, {0x000160c0, 0x006db6db}, {0x000160c4, 0x0186db60}, - {0x000160c8, 0x6db4db6c}, + {0x000160c8, 0x6db6db6c}, {0x000160cc, 0x6de6c300}, {0x000160d0, 0x14500820}, {0x00016100, 0x04cb0001}, {0x00016104, 0xfff80015}, {0x00016108, 0x00080010}, {0x0001610c, 0x00170000}, - {0x00016140, 0x10800000}, + {0x00016140, 0x50804000}, {0x00016144, 0x01884080}, {0x00016148, 0x000080c0}, - {0x00016280, 0x01000015}, + {0x00016280, 0x01001015}, {0x00016284, 0x14d20000}, {0x00016288, 0x00318000}, {0x0001628c, 0x50000000},
@@ -622,12 +624,12 @@ static const u32 ar9331_1p1_baseband_core[][2] = { {0x0000a370, 0x00000000}, {0x0000a390, 0x00000001}, {0x0000a394, 0x00000444}, - {0x0000a398, 0x001f0e0f}, - {0x0000a39c, 0x0075393f}, - {0x0000a3a0, 0xb79f6427}, - {0x0000a3a4, 0x00000000}, - {0x0000a3a8, 0xaaaaaaaa}, - {0x0000a3ac, 0x3c466478}, + {0x0000a398, 0x00000000}, + {0x0000a39c, 0x210d0401}, + {0x0000a3a0, 0xab9a7144}, + {0x0000a3a4, 0x00000011}, + {0x0000a3a8, 0x3c3c003d}, + {0x0000a3ac, 0x30310030}, {0x0000a3c0, 0x20202020}, {0x0000a3c4, 0x22222220}, {0x0000a3c8, 0x20200020},
@@ -686,100 +688,18 @@ static const u32 ar9331_1p1_baseband_core[][2] = { {0x0000a7dc, 0x00000001}, }; -static const u32 ar9331_modes_high_power_tx_gain_1p1[][5 ] = { +static const u32 ar9331_1p1_mac_postamble[][5 ] = {/* Addr 5G_HT20 5G_HT40 2G_HT40 2G_HT20 */ - {0x0000a2d8 ,0x7999a83a ,0x7999a83a ,0x7999a83a ,0x7999a83a }, - {0x0000a2dc ,0xffff2a52 ,0xffff2a52 ,0xffff2a52 ,0xffff2a52 }, - {0x0000a2e0 ,0xffffcc84 ,0xffffcc84 ,0xffffcc84 ,0xffffcc84 }, - {0x0000a2e4 ,0xfffff000 ,0xfffff000 ,0xfffff000 ,0xfffff000 }, - {0x0000a2e8 ,0xfffe0000 ,0xfffe0000 ,0xfffe0000 ,0xfffe0000 }, - {0x0000a410 ,0x000050d7 ,0x000050d7 ,0x000050d0 ,0x000050d0 }, - {0x0000a500 ,0x00022200 ,0x00022200 ,0x00000000 ,0x00000000 }, - {0x0000a504 ,0x05062002 ,0x05062002 ,0x04000002 ,0x04000002 }, - {0x0000a508 ,0x0c002e00 ,0x0c002e00 ,0x08000004 ,0x08000004 }, - {0x0000a50c ,0x11062202 ,0x11062202 ,0x0d000200 ,0x0d000200 }, - {0x0000a510 ,0x17022e00 ,0x17022e00 ,0x11000202 ,0x11000202 }, - {0x0000a514 ,0x1d000ec2 ,0x1d000ec2 ,0x15000400 ,0x15000400 }, - {0x0000a518 ,0x25020ec0 ,0x25020ec0 ,0x19000402 ,0x19000402 }, - {0x0000a51c ,0x2b020ec3 ,0x2b020ec3 ,0x1d000404 ,0x1d000404 }, - {0x0000a520 ,0x2f001f04 ,0x2f001f04 ,0x23000a00 ,0x23000a00 }, - {0x0000a524 ,0x35001fc4 ,0x35001fc4 ,0x27000a02 ,0x27000a02 }, - {0x0000a528 ,0x3c022f04 ,0x3c022f04 ,0x2b000a04 ,0x2b000a04 }, - {0x0000a52c ,0x41023e85 ,0x41023e85 ,0x2d000a20 ,0x2d000a20 }, - {0x0000a530 ,0x48023ec6 ,0x48023ec6 ,0x31000a22 ,0x31000a22 }, - {0x0000a534 ,0x4d023f01 ,0x4d023f01 ,0x35000a24 ,0x35000a24 }, - {0x0000a538 ,0x53023f4b ,0x53023f4b ,0x38000a43 ,0x38000a43 }, - {0x0000a53c ,0x5a027f09 ,0x5a027f09 ,0x3b000e42 ,0x3b000e42 }, - {0x0000a540 ,0x5f027fc9 ,0x5f027fc9 ,0x3f000e44 ,0x3f000e44 }, - {0x0000a544 ,0x6502feca ,0x6502feca ,0x42000e64 ,0x42000e64 }, - {0x0000a548 ,0x6b02ff4a ,0x6b02ff4a ,0x46000e66 ,0x46000e66 }, - {0x0000a54c ,0x7203feca ,0x7203feca ,0x4a000ea6 ,0x4a000ea6 }, - {0x0000a550 ,0x7703ff0b ,0x7703ff0b ,0x4a000ea6 ,0x4a000ea6 }, - {0x0000a554 ,0x7d06ffcb ,0x7d06ffcb ,0x4a000ea6 ,0x4a000ea6 }, - {0x0000a558 ,0x8407ff0b ,0x8407ff0b ,0x4a000ea6 ,0x4a000ea6 }, - {0x0000a55c ,0x8907ffcb ,0x8907ffcb ,0x4a000ea6 ,0x4a000ea6 }, - {0x0000a560 ,0x900fff0b ,0x900fff0b ,0x4a000ea6 ,0x4a000ea6 }, - {0x0000a564 ,0x960fffcb ,0x960fffcb ,0x4a000ea6 ,0x4a000ea6 }, - {0x0000a568 ,0x9c1fff0b ,0x9c1fff0b ,0x4a000ea6 ,0x4a000ea6 }, - {0x0000a56c ,0x9c1fff0b ,0x9c1fff0b ,0x4a000ea6 ,0x4a000ea6 }, - {0x0000a570 ,0x9c1fff0b ,0x9c1fff0b ,0x4a000ea6 ,0x4a000ea6 }, - {0x0000a574 ,0x9c1fff0b ,0x9c1fff0b ,0x4a000ea6 ,0x4a000ea6 }, - {0x0000a578 ,0x9c1fff0b ,0x9c1fff0b ,0x4a000ea6 ,0x4a000ea6 }, - {0x0000a57c ,0x9c1fff0b ,0x9c1fff0b ,0x4a000ea6 ,0x4a000ea6 }, - {0x0000a580 ,0x00022200 ,0x00022200 ,0x00000000 ,0x00000000 }, - {0x0000a584 ,0x05062002 ,0x05062002 ,0x04000002 ,0x04000002 }, - {0x0000a588 ,0x0c002e00 ,0x0c002e00 ,0x08000004 ,0x08000004 }, - {0x0000a58c ,0x11062202 ,0x11062202 ,0x0b000200 ,0x0b000200 }, - {0x0000a590 ,0x17022e00 ,0x17022e00 ,0x0f000202 ,0x0f000202 }, - {0x0000a594 ,0x1d000ec2 ,0x1d000ec2 ,0x11000400 ,0x11000400 }, - {0x0000a598 ,0x25020ec0 ,0x25020ec0 ,0x15000402 ,0x15000402 }, - {0x0000a59c ,0x2b020ec3 ,0x2b020ec3 ,0x19000404 ,0x19000404 }, - {0x0000a5a0 ,0x2f001f04 ,0x2f001f04 ,0x1b000603 ,0x1b000603 }, - {0x0000a5a4 ,0x35001fc4 ,0x35001fc4 ,0x1f000a02 ,0x1f000a02 }, - {0x0000a5a8 ,0x3c022f04 ,0x3c022f04 ,0x23000a04 ,0x23000a04 }, - {0x0000a5ac ,0x41023e85 ,0x41023e85 ,0x26000a20 ,0x26000a20 }, - {0x0000a5b0 ,0x48023ec6 ,0x48023ec6 ,0x2a000e20 ,0x2a000e20 }, - {0x0000a5b4 ,0x4d023f01 ,0x4d023f01 ,0x2e000e22 ,0x2e000e22 }, - {0x0000a5b8 ,0x53023f4b ,0x53023f4b ,0x31000e24 ,0x31000e24 }, - {0x0000a5bc ,0x5a027f09 ,0x5a027f09 ,0x34001640 ,0x34001640 }, - {0x0000a5c0 ,0x5f027fc9 ,0x5f027fc9 ,0x38001660 ,0x38001660 }, - {0x0000a5c4 ,0x6502feca ,0x6502feca ,0x3b001861 ,0x3b001861 }, - {0x0000a5c8 ,0x6b02ff4a ,0x6b02ff4a ,0x3e001a81 ,0x3e001a81 }, - {0x0000a5cc ,0x7203feca ,0x7203feca ,0x42001a83 ,0x42001a83 }, - {0x0000a5d0 ,0x7703ff0b ,0x7703ff0b ,0x44001c84 ,0x44001c84 }, - {0x0000a5d4 ,0x7d06ffcb ,0x7d06ffcb ,0x48001ce3 ,0x48001ce3 }, - {0x0000a5d8 ,0x8407ff0b ,0x8407ff0b ,0x4c001ce5 ,0x4c001ce5 }, - {0x0000a5dc ,0x8907ffcb ,0x8907ffcb ,0x50001ce9 ,0x50001ce9 }, - {0x0000a5e0 ,0x900fff0b ,0x900fff0b ,0x54001ceb ,0x54001ceb }, - {0x0000a5e4 ,0x960fffcb ,0x960fffcb ,0x56001eec ,0x56001eec }, - {0x0000a5e8 ,0x9c1fff0b ,0x9c1fff0b ,0x56001eec ,0x56001eec }, - {0x0000a5ec ,0x9c1fff0b ,0x9c1fff0b ,0x56001eec ,0x56001eec }, - {0x0000a5f0 ,0x9c1fff0b ,0x9c1fff0b ,0x56001eec ,0x56001eec }, - {0x0000a5f4 ,0x9c1fff0b ,0x9c1fff0b ,0x56001eec ,0x56001eec }, - {0x0000a5f8 ,0x9c1fff0b ,0x9c1fff0b ,0x56001eec ,0x56001eec }, - {0x0000a5fc ,0x9c1fff0b ,0x9c1fff0b ,0x56001eec ,0x56001eec }, - {0x0000a600 ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, - {0x0000a604 ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, - {0x0000a608 ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, - {0x0000a60c ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, - {0x0000a610 ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, - {0x0000a614 ,0x01404000 ,0x01404000 ,0x01404000 ,0x01404000 }, - {0x0000a618 ,0x01404501 ,0x01404501 ,0x01404501 ,0x01404501 }, - {0x0000a61c ,0x02008802 ,0x02008802 ,0x02008802 ,0x02008802 }, - {0x0000a620 ,0x0280c802 ,0x0280c802 ,0x0280c802 ,0x0280c802 }, - {0x0000a624 ,0x03010a03 ,0x03010a03 ,0x03010a03 ,0x03010a03 }, - {0x0000a628 ,0x03010c04 ,0x03010c04 ,0x03010c04 ,0x03010c04 }, - {0x0000a62c ,0x03010c04 ,0x03010c04 ,0x03010c04 ,0x03010c04 }, - {0x0000a630 ,0x03010c04 ,0x03010c04 ,0x03010c04 ,0x03010c04 }, - {0x0000a634 ,0x03010c04 ,0x03010c04 ,0x03010c04 ,0x03010c04 }, - {0x0000a638 ,0x03010c04 ,0x03010c04 ,0x03010c04 ,0x03010c04 }, - {0x0000a63c ,0x03010c04 ,0x03010c04 ,0x03010c04 ,0x03010c04 }, - {0x00016044 ,0x034922db ,0x034922db ,0x034922db ,0x034922db }, - {0x00016284 ,0x14d3f000 ,0x14d3f000 ,0x14d3f000 ,0x14d3f000 }, + {0x00001030 ,0x00000230 ,0x00000460 ,0x000002c0 ,0x00000160 }, + {0x00001070 ,0x00000168 ,0x000002d0 ,0x00000318 ,0x0000018c }, + {0x000010b0 ,0x00000e60 ,0x00001cc0 ,0x00007c70 ,0x00003e38 }, + {0x00008014 ,0x03e803e8 ,0x07d007d0 ,0x10801600 ,0x08400b00 }, + {0x0000801c ,0x128d8027 ,0x128d804f ,0x12e00057 ,0x12e0002b }, + {0x00008120 ,0x08f04800 ,0x08f04800 ,0x08f04810 ,0x08f04810 }, + {0x000081d0 ,0x00003210 ,0x00003210 ,0x0000320a ,0x0000320a }, + {0x00008318 ,0x00003e80 ,0x00007d00 ,0x00006880 ,0x00003440 }, }; -#define ar9331_1p1_mac_postamble ar9300_2p2_mac_postamble -static const u32 ar9331_1p1_soc_preamble[][2 ] = {/* Addr allmodes */ {0x00007020, 0x00000000},
Signature · 1 line
1.8.4.2
PATCH 6/16 ath9k: Update AR9331 v1.2 initvals
In reply to Sujith ManoharanFrom: Sujith Manoharan <[email protected]>
--- .../net/wireless/ath/ath9k/ar9330_1p2_initvals.h | 401 +++++++++++++++++---- 1 file changed, 333 insertions(+), 68 deletions(-)
drivers/net/wireless/ath/ath9k/ar9330_1p2_initvals.h +333 -68
@@ -18,6 +18,28 @@#ifndef INITVALS_9330_1P2_H #define INITVALS_9330_1P2_H +#define ar9331_modes_high_power_tx_gain_1p2 ar9331_modes_high_ob_db_tx_gain_1p2 + +#define ar9331_modes_low_ob_db_tx_gain_1p2 ar9331_modes_high_ob_db_tx_gain_1p2 + +#define ar9331_modes_lowest_ob_db_tx_gain_1p2 ar9331_modes_high_ob_db_tx_gain_1p2 + +#define ar9331_1p2_baseband_core_txfir_coeff_japan_2484 ar9331_1p1_baseband_core_txfir_coeff_japan_2484 + +#define ar9331_1p2_xtal_25M ar9331_1p1_xtal_25M + +#define ar9331_1p2_xtal_40M ar9331_1p1_xtal_40M + +#define ar9331_1p2_soc_postamble ar9331_1p1_soc_postamble + +#define ar9331_1p2_mac_postamble ar9331_1p1_mac_postamble + +#define ar9331_1p2_soc_preamble ar9331_1p1_soc_preamble + +#define ar9331_1p2_mac_core ar9331_1p1_mac_core + +#define ar9331_common_wo_xlna_rx_gain_1p2 ar9331_common_wo_xlna_rx_gain_1p1 +static const u32 ar9331_modes_high_ob_db_tx_gain_1p2[][5 ] = {/* Addr 5G_HT20 5G_HT40 2G_HT40 2G_HT20 */ {0x0000a410, 0x000050d7, 0x000050d7, 0x000050d7, 0x000050d7},
@@ -103,57 +125,6 @@ static const u32 ar9331_modes_high_ob_db_tx_gain_1p2[][5] = { {0x0000a63c, 0x04011004, 0x04011004, 0x04011004, 0x04011004}, }; -#define ar9331_modes_high_power_tx_gain_1p2 ar9331_modes_high_ob_db_tx_gain_1p2 - -#define ar9331_modes_low_ob_db_tx_gain_1p2 ar9331_modes_high_power_tx_gain_1p2 - -#define ar9331_modes_lowest_ob_db_tx_gain_1p2 ar9331_modes_low_ob_db_tx_gain_1p2 - -static const u32 ar9331_1p2_baseband_postamble[][5 ] = { -/* Addr 5G_HT20 5G_HT40 2G_HT40 2G_HT20 */ - {0x00009810 ,0xd00a8005 ,0xd00a8005 ,0xd00a8005 ,0xd00a8005 }, - {0x00009820 ,0x206a002e ,0x206a002e ,0x206a002e ,0x206a002e }, - {0x00009824 ,0x5ac640d0 ,0x5ac640d0 ,0x5ac640d0 ,0x5ac640d0 }, - {0x00009828 ,0x06903081 ,0x06903081 ,0x06903881 ,0x06903881 }, - {0x0000982c ,0x05eea6d4 ,0x05eea6d4 ,0x05eea6d4 ,0x05eea6d4 }, - {0x00009830 ,0x0000059c ,0x0000059c ,0x0000059c ,0x0000059c }, - {0x00009c00 ,0x00000044 ,0x00000044 ,0x00000044 ,0x00000044 }, - {0x00009e00 ,0x0372161e ,0x0372161e ,0x037216a4 ,0x037216a4 }, - {0x00009e04 ,0x00182020 ,0x00182020 ,0x00182020 ,0x00182020 }, - {0x00009e0c ,0x6c4000e2 ,0x6d4000e2 ,0x6d4000e2 ,0x6c4000e2 }, - {0x00009e10 ,0x7ec80d2e ,0x7ec80d2e ,0x7ec80d2e ,0x7ec80d2e }, - {0x00009e14 ,0x31395d5e ,0x3139605e ,0x3139605e ,0x31395d5e }, - {0x00009e18 ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, - {0x00009e1c ,0x0001cf9c ,0x0001cf9c ,0x00021f9c ,0x00021f9c }, - {0x00009e20 ,0x000003b5 ,0x000003b5 ,0x000003ce ,0x000003ce }, - {0x00009e2c ,0x0000001c ,0x0000001c ,0x00003221 ,0x00003221 }, - {0x00009e3c ,0xcf946222 ,0xcf946222 ,0xcf946222 ,0xcf946222 }, - {0x00009e44 ,0x02321e27 ,0x02321e27 ,0x02282324 ,0x02282324 }, - {0x00009e48 ,0x5030201a ,0x5030201a ,0x50302010 ,0x50302010 }, - {0x00009fc8 ,0x0003f000 ,0x0003f000 ,0x0001a000 ,0x0001a000 }, - {0x0000a204 ,0x00003fc0 ,0x00003fc4 ,0x00003fc4 ,0x00003fc0 }, - {0x0000a208 ,0x00000104 ,0x00000104 ,0x00000004 ,0x00000004 }, - {0x0000a230 ,0x0000000a ,0x00000014 ,0x00000016 ,0x0000000b }, - {0x0000a234 ,0x00000fff ,0x00000fff ,0x10000fff ,0x00000fff }, - {0x0000a238 ,0xffb81018 ,0xffb81018 ,0xffb81018 ,0xffb81018 }, - {0x0000a250 ,0x00000000 ,0x00000000 ,0x00000210 ,0x00000108 }, - {0x0000a254 ,0x000007d0 ,0x00000fa0 ,0x00001130 ,0x00000898 }, - {0x0000a258 ,0x02020002 ,0x02020002 ,0x02020002 ,0x02020002 }, - {0x0000a25c ,0x01000e0e ,0x01000e0e ,0x01000e0e ,0x01000e0e }, - {0x0000a260 ,0x3a021501 ,0x3a021501 ,0x3a021501 ,0x3a021501 }, - {0x0000a264 ,0x00000e0e ,0x00000e0e ,0x00000e0e ,0x00000e0e }, - {0x0000a280 ,0x00000007 ,0x00000007 ,0x0000000b ,0x0000000b }, - {0x0000a284 ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, - {0x0000a288 ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, - {0x0000a28c ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, - {0x0000a2c4 ,0x00158d18 ,0x00158d18 ,0x00158d18 ,0x00158d18 }, - {0x0000a2d0 ,0x00071981 ,0x00071981 ,0x00071981 ,0x00071981 }, - {0x0000a2d8 ,0xf999a83a ,0xf999a83a ,0xf999a83a ,0xf999a83a }, - {0x0000a358 ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, - {0x0000ae04 ,0x00802020 ,0x00802020 ,0x00802020 ,0x00802020 }, - {0x0000ae18 ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, -}; -static const u32 ar9331_1p2_radio_core[][2 ] = {/* Addr allmodes */ {0x00016000, 0x36db6db6},
@@ -219,24 +190,318 @@ static const u32 ar9331_1p2_radio_core[][2] = { {0x000163d4, 0x00000000}, }; -#define ar9331_1p2_baseband_core_txfir_coeff_japan_2484 ar9331_1p1_baseband_core_txfir_coeff_japan_2484 - -#define ar9331_1p2_xtal_25M ar9331_1p1_xtal_25M - -#define ar9331_1p2_xtal_40M ar9331_1p1_xtal_40M - -#define ar9331_1p2_baseband_core ar9331_1p1_baseband_core - -#define ar9331_1p2_soc_postamble ar9331_1p1_soc_postamble - -#define ar9331_1p2_mac_postamble ar9331_1p1_mac_postamble - -#define ar9331_1p2_soc_preamble ar9331_1p1_soc_preamble - -#define ar9331_1p2_mac_core ar9331_1p1_mac_core +static const u32 ar9331_1p2_baseband_core[][2] = { + /* Addr allmodes */ + {0x00009800, 0xafe68e30}, + {0x00009804, 0xfd14e000}, + {0x00009808, 0x9c0a8f6b}, + {0x0000980c, 0x04800000}, + {0x00009814, 0x9280c00a}, + {0x00009818, 0x00000000}, + {0x0000981c, 0x00020028}, + {0x00009834, 0x5f3ca3de}, + {0x00009838, 0x0108ecff}, + {0x0000983c, 0x14750600}, + {0x00009880, 0x201fff00}, + {0x00009884, 0x00001042}, + {0x000098a4, 0x00200400}, + {0x000098b0, 0x32840bbe}, + {0x000098d0, 0x004b6a8e}, + {0x000098d4, 0x00000820}, + {0x000098dc, 0x00000000}, + {0x000098f0, 0x00000000}, + {0x000098f4, 0x00000000}, + {0x00009c04, 0x00000000}, + {0x00009c08, 0x03200000}, + {0x00009c0c, 0x00000000}, + {0x00009c10, 0x00000000}, + {0x00009c14, 0x00046384}, + {0x00009c18, 0x05b6b440}, + {0x00009c1c, 0x00b6b440}, + {0x00009d00, 0xc080a333}, + {0x00009d04, 0x40206c10}, + {0x00009d08, 0x009c4060}, + {0x00009d0c, 0x1883800a}, + {0x00009d10, 0x01834061}, + {0x00009d14, 0x00c00400}, + {0x00009d18, 0x00000000}, + {0x00009e08, 0x0038233c}, + {0x00009e24, 0x9927b515}, + {0x00009e28, 0x12ef0200}, + {0x00009e30, 0x06336f77}, + {0x00009e34, 0x6af6532f}, + {0x00009e38, 0x0cc80c00}, + {0x00009e40, 0x0d261820}, + {0x00009e4c, 0x00001004}, + {0x00009e50, 0x00ff03f1}, + {0x00009fc0, 0x803e4788}, + {0x00009fc4, 0x0001efb5}, + {0x00009fcc, 0x40000014}, + {0x0000a20c, 0x00000000}, + {0x0000a220, 0x00000000}, + {0x0000a224, 0x00000000}, + {0x0000a228, 0x10002310}, + {0x0000a23c, 0x00000000}, + {0x0000a244, 0x0c000000}, + {0x0000a2a0, 0x00000001}, + {0x0000a2c0, 0x00000001}, + {0x0000a2c8, 0x00000000}, + {0x0000a2cc, 0x18c43433}, + {0x0000a2d4, 0x00000000}, + {0x0000a2dc, 0x00000000}, + {0x0000a2e0, 0x00000000}, + {0x0000a2e4, 0x00000000}, + {0x0000a2e8, 0x00000000}, + {0x0000a2ec, 0x00000000}, + {0x0000a2f0, 0x00000000}, + {0x0000a2f4, 0x00000000}, + {0x0000a2f8, 0x00000000}, + {0x0000a344, 0x00000000}, + {0x0000a34c, 0x00000000}, + {0x0000a350, 0x0000a000}, + {0x0000a364, 0x00000000}, + {0x0000a370, 0x00000000}, + {0x0000a390, 0x00000001}, + {0x0000a394, 0x00000444}, + {0x0000a398, 0x001f0e0f}, + {0x0000a39c, 0x0075393f}, + {0x0000a3a0, 0xb79f6427}, + {0x0000a3a4, 0x00000000}, + {0x0000a3a8, 0xaaaaaaaa}, + {0x0000a3ac, 0x3c466478}, + {0x0000a3c0, 0x20202020}, + {0x0000a3c4, 0x22222220}, + {0x0000a3c8, 0x20200020}, + {0x0000a3cc, 0x20202020}, + {0x0000a3d0, 0x20202020}, + {0x0000a3d4, 0x20202020}, + {0x0000a3d8, 0x20202020}, + {0x0000a3dc, 0x20202020}, + {0x0000a3e0, 0x20202020}, + {0x0000a3e4, 0x20202020}, + {0x0000a3e8, 0x20202020}, + {0x0000a3ec, 0x20202020}, + {0x0000a3f0, 0x00000000}, + {0x0000a3f4, 0x00000006}, + {0x0000a3f8, 0x0cdbd380}, + {0x0000a3fc, 0x000f0f01}, + {0x0000a400, 0x8fa91f01}, + {0x0000a404, 0x00000000}, + {0x0000a408, 0x0e79e5c6}, + {0x0000a40c, 0x00820820}, + {0x0000a414, 0x1ce739ce}, + {0x0000a418, 0x2d001dce}, + {0x0000a41c, 0x1ce739ce}, + {0x0000a420, 0x000001ce}, + {0x0000a424, 0x1ce739ce}, + {0x0000a428, 0x000001ce}, + {0x0000a42c, 0x1ce739ce}, + {0x0000a430, 0x1ce739ce}, + {0x0000a434, 0x00000000}, + {0x0000a438, 0x00001801}, + {0x0000a43c, 0x00000000}, + {0x0000a440, 0x00000000}, + {0x0000a444, 0x00000000}, + {0x0000a448, 0x04000000}, + {0x0000a44c, 0x00000001}, + {0x0000a450, 0x00010000}, + {0x0000a458, 0x00000000}, + {0x0000a640, 0x00000000}, + {0x0000a644, 0x3fad9d74}, + {0x0000a648, 0x0048060a}, + {0x0000a64c, 0x00003c37}, + {0x0000a670, 0x03020100}, + {0x0000a674, 0x09080504}, + {0x0000a678, 0x0d0c0b0a}, + {0x0000a67c, 0x13121110}, + {0x0000a680, 0x31301514}, + {0x0000a684, 0x35343332}, + {0x0000a688, 0x00000036}, + {0x0000a690, 0x00000838}, + {0x0000a7c0, 0x00000000}, + {0x0000a7c4, 0xfffffffc}, + {0x0000a7c8, 0x00000000}, + {0x0000a7cc, 0x00000000}, + {0x0000a7d0, 0x00000000}, + {0x0000a7d4, 0x00000004}, + {0x0000a7dc, 0x00000001}, +}; -#define ar9331_common_wo_xlna_rx_gain_1p2 ar9331_common_wo_xlna_rx_gain_1p1 +static const u32 ar9331_1p2_baseband_postamble[][5] = { + /* Addr 5G_HT20 5G_HT40 2G_HT40 2G_HT20 */ + {0x00009810, 0xd00a8005, 0xd00a8005, 0xd00a8005, 0xd00a8005}, + {0x00009820, 0x206a002e, 0x206a002e, 0x206a002e, 0x206a002e}, + {0x00009824, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0}, + {0x00009828, 0x06903081, 0x06903081, 0x06903881, 0x06903881}, + {0x0000982c, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4}, + {0x00009830, 0x0000059c, 0x0000059c, 0x0000059c, 0x0000059c}, + {0x00009c00, 0x00000044, 0x00000044, 0x00000044, 0x00000044}, + {0x00009e00, 0x0372161e, 0x0372161e, 0x037216a4, 0x037216a4}, + {0x00009e04, 0x00182020, 0x00182020, 0x00182020, 0x00182020}, + {0x00009e0c, 0x6c4000e2, 0x6d4000e2, 0x6d4000e2, 0x6c4000e2}, + {0x00009e10, 0x7ec80d2e, 0x7ec80d2e, 0x7ec80d2e, 0x7ec80d2e}, + {0x00009e14, 0x31395d5e, 0x3139605e, 0x3139605e, 0x31395d5e}, + {0x00009e18, 0x00000000, 0x00000000, 0x00000000, 0x00000000}, + {0x00009e1c, 0x0001cf9c, 0x0001cf9c, 0x00021f9c, 0x00021f9c}, + {0x00009e20, 0x000003b5, 0x000003b5, 0x000003ce, 0x000003ce}, + {0x00009e2c, 0x0000001c, 0x0000001c, 0x00003221, 0x00003221}, + {0x00009e3c, 0xcf946222, 0xcf946222, 0xcf946222, 0xcf946222}, + {0x00009e44, 0x02321e27, 0x02321e27, 0x02282324, 0x02282324}, + {0x00009e48, 0x5030201a, 0x5030201a, 0x50302010, 0x50302010}, + {0x00009fc8, 0x0003f000, 0x0003f000, 0x0001a000, 0x0001a000}, + {0x0000a204, 0x00003fc0, 0x00003fc4, 0x00003fc4, 0x00003fc0}, + {0x0000a208, 0x00000104, 0x00000104, 0x00000004, 0x00000004}, + {0x0000a230, 0x0000000a, 0x00000014, 0x00000016, 0x0000000b}, + {0x0000a234, 0x00000fff, 0x00000fff, 0x10000fff, 0x00000fff}, + {0x0000a238, 0xffb81018, 0xffb81018, 0xffb81018, 0xffb81018}, + {0x0000a250, 0x00000000, 0x00000000, 0x00000210, 0x00000108}, + {0x0000a254, 0x000007d0, 0x00000fa0, 0x00001130, 0x00000898}, + {0x0000a258, 0x02020002, 0x02020002, 0x02020002, 0x02020002}, + {0x0000a25c, 0x01000e0e, 0x01000e0e, 0x01000e0e, 0x01000e0e}, + {0x0000a260, 0x3a021501, 0x3a021501, 0x3a021501, 0x3a021501}, + {0x0000a264, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e}, + {0x0000a280, 0x00000007, 0x00000007, 0x0000000b, 0x0000000b}, + {0x0000a284, 0x00000000, 0x00000000, 0x00000000, 0x00000000}, + {0x0000a288, 0x00000000, 0x00000000, 0x00000000, 0x00000000}, + {0x0000a28c, 0x00000000, 0x00000000, 0x00000000, 0x00000000}, + {0x0000a2c4, 0x00158d18, 0x00158d18, 0x00158d18, 0x00158d18}, + {0x0000a2d0, 0x00071981, 0x00071981, 0x00071981, 0x00071981}, + {0x0000a2d8, 0xf999a83a, 0xf999a83a, 0xf999a83a, 0xf999a83a}, + {0x0000a358, 0x00000000, 0x00000000, 0x00000000, 0x00000000}, + {0x0000ae04, 0x00802020, 0x00802020, 0x00802020, 0x00802020}, + {0x0000ae18, 0x00000000, 0x00000000, 0x00000000, 0x00000000}, +}; -#define ar9331_common_rx_gain_1p2 ar9485_common_rx_gain_1_1 +static const u32 ar9331_common_rx_gain_1p2[][2] = { + /* Addr allmodes */ + {0x0000a000, 0x00010000}, + {0x0000a004, 0x00030002}, + {0x0000a008, 0x00050004}, + {0x0000a00c, 0x00810080}, + {0x0000a010, 0x01800082}, + {0x0000a014, 0x01820181}, + {0x0000a018, 0x01840183}, + {0x0000a01c, 0x01880185}, + {0x0000a020, 0x018a0189}, + {0x0000a024, 0x02850284}, + {0x0000a028, 0x02890288}, + {0x0000a02c, 0x03850384}, + {0x0000a030, 0x03890388}, + {0x0000a034, 0x038b038a}, + {0x0000a038, 0x038d038c}, + {0x0000a03c, 0x03910390}, + {0x0000a040, 0x03930392}, + {0x0000a044, 0x03950394}, + {0x0000a048, 0x00000396}, + {0x0000a04c, 0x00000000}, + {0x0000a050, 0x00000000}, + {0x0000a054, 0x00000000}, + {0x0000a058, 0x00000000}, + {0x0000a05c, 0x00000000}, + {0x0000a060, 0x00000000}, + {0x0000a064, 0x00000000}, + {0x0000a068, 0x00000000}, + {0x0000a06c, 0x00000000}, + {0x0000a070, 0x00000000}, + {0x0000a074, 0x00000000}, + {0x0000a078, 0x00000000}, + {0x0000a07c, 0x00000000}, + {0x0000a080, 0x28282828}, + {0x0000a084, 0x28282828}, + {0x0000a088, 0x28282828}, + {0x0000a08c, 0x28282828}, + {0x0000a090, 0x28282828}, + {0x0000a094, 0x21212128}, + {0x0000a098, 0x171c1c1c}, + {0x0000a09c, 0x02020212}, + {0x0000a0a0, 0x00000202}, + {0x0000a0a4, 0x00000000}, + {0x0000a0a8, 0x00000000}, + {0x0000a0ac, 0x00000000}, + {0x0000a0b0, 0x00000000}, + {0x0000a0b4, 0x00000000}, + {0x0000a0b8, 0x00000000}, + {0x0000a0bc, 0x00000000}, + {0x0000a0c0, 0x001f0000}, + {0x0000a0c4, 0x111f1100}, + {0x0000a0c8, 0x111d111e}, + {0x0000a0cc, 0x111b111c}, + {0x0000a0d0, 0x22032204}, + {0x0000a0d4, 0x22012202}, + {0x0000a0d8, 0x221f2200}, + {0x0000a0dc, 0x221d221e}, + {0x0000a0e0, 0x33013302}, + {0x0000a0e4, 0x331f3300}, + {0x0000a0e8, 0x4402331e}, + {0x0000a0ec, 0x44004401}, + {0x0000a0f0, 0x441e441f}, + {0x0000a0f4, 0x55015502}, + {0x0000a0f8, 0x551f5500}, + {0x0000a0fc, 0x6602551e}, + {0x0000a100, 0x66006601}, + {0x0000a104, 0x661e661f}, + {0x0000a108, 0x7703661d}, + {0x0000a10c, 0x77017702}, + {0x0000a110, 0x00007700}, + {0x0000a114, 0x00000000}, + {0x0000a118, 0x00000000}, + {0x0000a11c, 0x00000000}, + {0x0000a120, 0x00000000}, + {0x0000a124, 0x00000000}, + {0x0000a128, 0x00000000}, + {0x0000a12c, 0x00000000}, + {0x0000a130, 0x00000000}, + {0x0000a134, 0x00000000}, + {0x0000a138, 0x00000000}, + {0x0000a13c, 0x00000000}, + {0x0000a140, 0x001f0000}, + {0x0000a144, 0x111f1100}, + {0x0000a148, 0x111d111e}, + {0x0000a14c, 0x111b111c}, + {0x0000a150, 0x22032204}, + {0x0000a154, 0x22012202}, + {0x0000a158, 0x221f2200}, + {0x0000a15c, 0x221d221e}, + {0x0000a160, 0x33013302}, + {0x0000a164, 0x331f3300}, + {0x0000a168, 0x4402331e}, + {0x0000a16c, 0x44004401}, + {0x0000a170, 0x441e441f}, + {0x0000a174, 0x55015502}, + {0x0000a178, 0x551f5500}, + {0x0000a17c, 0x6602551e}, + {0x0000a180, 0x66006601}, + {0x0000a184, 0x661e661f}, + {0x0000a188, 0x7703661d}, + {0x0000a18c, 0x77017702}, + {0x0000a190, 0x00007700}, + {0x0000a194, 0x00000000}, + {0x0000a198, 0x00000000}, + {0x0000a19c, 0x00000000}, + {0x0000a1a0, 0x00000000}, + {0x0000a1a4, 0x00000000}, + {0x0000a1a8, 0x00000000}, + {0x0000a1ac, 0x00000000}, + {0x0000a1b0, 0x00000000}, + {0x0000a1b4, 0x00000000}, + {0x0000a1b8, 0x00000000}, + {0x0000a1bc, 0x00000000}, + {0x0000a1c0, 0x00000000}, + {0x0000a1c4, 0x00000000}, + {0x0000a1c8, 0x00000000}, + {0x0000a1cc, 0x00000000}, + {0x0000a1d0, 0x00000000}, + {0x0000a1d4, 0x00000000}, + {0x0000a1d8, 0x00000000}, + {0x0000a1dc, 0x00000000}, + {0x0000a1e0, 0x00000000}, + {0x0000a1e4, 0x00000000}, + {0x0000a1e8, 0x00000000}, + {0x0000a1ec, 0x00000000}, + {0x0000a1f0, 0x00000396}, + {0x0000a1f4, 0x00000396}, + {0x0000a1f8, 0x00000396}, + {0x0000a1fc, 0x00000296}, +}; #endif /* INITVALS_9330_1P2_H */
Signature · 1 line
1.8.4.2
PATCH 7/16 ath9k: Use a separate TX gain table for WZR-HP-G450H
In reply to Sujith ManoharanFrom: Sujith Manoharan <[email protected]>
The Buffalo device WZR-HP-G450H uses the index 3 for TX gain, which is set to the high_power table currently. Later variants of the router use the same index, but instead refer to the low_ob_db gain table. This is not handled in the driver since there is no way to distinguish board revisions and the high_power table is used (incorrectly) for the newer variants.
By default, devices based on AR9300 using the TX gain index 3 have to use the high_power table. To make sure that WZR-HP-G450H is not broken when the high_power table is updated, use a separate array based on information obtained from the platform data.
The current situation where only the original variant of WZR-HP-G450H works properly stays unchanged.
--- .../wireless/ath/ath9k/ar9003_buffalo_initvals.h | 126 +++++++++++++++++++++ drivers/net/wireless/ath/ath9k/ar9003_hw.c | 12 +- drivers/net/wireless/ath/ath9k/hw.h | 1 + drivers/net/wireless/ath/ath9k/init.c | 36 ++++-- include/linux/ath9k_platform.h | 2 + 5 files changed, 165 insertions(+), 12 deletions(-) create mode 100644 drivers/net/wireless/ath/ath9k/ar9003_buffalo_initvals.h
drivers/net/wireless/ath/ath9k/ar9003_buffalo_initvals.h new file +126 -0
@@ -0,0 +1,126 @@ +/* +* Copyright (c) 2013 Qualcomm Atheros Inc. +* +* Permission to use, copy, modify, and/or distribute this software for any +* purpose with or without fee is hereby granted, provided that the above +* copyright notice and this permission notice appear in all copies. +* +* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +*/ + +#ifndef INITVALS_9003_BUFFALO_H +#define INITVALS_9003_BUFFALO_H + +static const u32 ar9300Modes_high_power_tx_gain_table_buffalo[][5 ] = { +/* Addr 5G_HT20 5G_HT40 2G_HT40 2G_HT20 */ + {0x0000a2dc ,0x0380c7fc ,0x0380c7fc ,0x03aaa352 ,0x03aaa352 }, + {0x0000a2e0 ,0x0000f800 ,0x0000f800 ,0x03ccc584 ,0x03ccc584 }, + {0x0000a2e4 ,0x03ff0000 ,0x03ff0000 ,0x03f0f800 ,0x03f0f800 }, + {0x0000a2e8 ,0x00000000 ,0x00000000 ,0x03ff0000 ,0x03ff0000 }, + {0x0000a410 ,0x000050d8 ,0x000050d8 ,0x000050d9 ,0x000050d9 }, + {0x0000a500 ,0x00002220 ,0x00002220 ,0x00000000 ,0x00000000 }, + {0x0000a504 ,0x04002222 ,0x04002222 ,0x04000002 ,0x04000002 }, + {0x0000a508 ,0x09002421 ,0x09002421 ,0x08000004 ,0x08000004 }, + {0x0000a50c ,0x0d002621 ,0x0d002621 ,0x0b000200 ,0x0b000200 }, + {0x0000a510 ,0x13004620 ,0x13004620 ,0x0f000202 ,0x0f000202 }, + {0x0000a514 ,0x19004a20 ,0x19004a20 ,0x11000400 ,0x11000400 }, + {0x0000a518 ,0x1d004e20 ,0x1d004e20 ,0x15000402 ,0x15000402 }, + {0x0000a51c ,0x21005420 ,0x21005420 ,0x19000404 ,0x19000404 }, + {0x0000a520 ,0x26005e20 ,0x26005e20 ,0x1b000603 ,0x1b000603 }, + {0x0000a524 ,0x2b005e40 ,0x2b005e40 ,0x1f000a02 ,0x1f000a02 }, + {0x0000a528 ,0x2f005e42 ,0x2f005e42 ,0x23000a04 ,0x23000a04 }, + {0x0000a52c ,0x33005e44 ,0x33005e44 ,0x26000a20 ,0x26000a20 }, + {0x0000a530 ,0x38005e65 ,0x38005e65 ,0x2a000e20 ,0x2a000e20 }, + {0x0000a534 ,0x3c005e69 ,0x3c005e69 ,0x2e000e22 ,0x2e000e22 }, + {0x0000a538 ,0x40005e6b ,0x40005e6b ,0x31000e24 ,0x31000e24 }, + {0x0000a53c ,0x44005e6d ,0x44005e6d ,0x34001640 ,0x34001640 }, + {0x0000a540 ,0x49005e72 ,0x49005e72 ,0x38001660 ,0x38001660 }, + {0x0000a544 ,0x4e005eb2 ,0x4e005eb2 ,0x3b001861 ,0x3b001861 }, + {0x0000a548 ,0x53005f12 ,0x53005f12 ,0x3e001a81 ,0x3e001a81 }, + {0x0000a54c ,0x59025eb2 ,0x59025eb2 ,0x42001a83 ,0x42001a83 }, + {0x0000a550 ,0x5e025f12 ,0x5e025f12 ,0x44001c84 ,0x44001c84 }, + {0x0000a554 ,0x61027f12 ,0x61027f12 ,0x48001ce3 ,0x48001ce3 }, + {0x0000a558 ,0x6702bf12 ,0x6702bf12 ,0x4c001ce5 ,0x4c001ce5 }, + {0x0000a55c ,0x6b02bf14 ,0x6b02bf14 ,0x50001ce9 ,0x50001ce9 }, + {0x0000a560 ,0x6f02bf16 ,0x6f02bf16 ,0x54001ceb ,0x54001ceb }, + {0x0000a564 ,0x6f02bf16 ,0x6f02bf16 ,0x56001eec ,0x56001eec }, + {0x0000a568 ,0x6f02bf16 ,0x6f02bf16 ,0x56001eec ,0x56001eec }, + {0x0000a56c ,0x6f02bf16 ,0x6f02bf16 ,0x56001eec ,0x56001eec }, + {0x0000a570 ,0x6f02bf16 ,0x6f02bf16 ,0x56001eec ,0x56001eec }, + {0x0000a574 ,0x6f02bf16 ,0x6f02bf16 ,0x56001eec ,0x56001eec }, + {0x0000a578 ,0x6f02bf16 ,0x6f02bf16 ,0x56001eec ,0x56001eec }, + {0x0000a57c ,0x6f02bf16 ,0x6f02bf16 ,0x56001eec ,0x56001eec }, + {0x0000a580 ,0x00802220 ,0x00802220 ,0x00800000 ,0x00800000 }, + {0x0000a584 ,0x04802222 ,0x04802222 ,0x04800002 ,0x04800002 }, + {0x0000a588 ,0x09802421 ,0x09802421 ,0x08800004 ,0x08800004 }, + {0x0000a58c ,0x0d802621 ,0x0d802621 ,0x0b800200 ,0x0b800200 }, + {0x0000a590 ,0x13804620 ,0x13804620 ,0x0f800202 ,0x0f800202 }, + {0x0000a594 ,0x19804a20 ,0x19804a20 ,0x11800400 ,0x11800400 }, + {0x0000a598 ,0x1d804e20 ,0x1d804e20 ,0x15800402 ,0x15800402 }, + {0x0000a59c ,0x21805420 ,0x21805420 ,0x19800404 ,0x19800404 }, + {0x0000a5a0 ,0x26805e20 ,0x26805e20 ,0x1b800603 ,0x1b800603 }, + {0x0000a5a4 ,0x2b805e40 ,0x2b805e40 ,0x1f800a02 ,0x1f800a02 }, + {0x0000a5a8 ,0x2f805e42 ,0x2f805e42 ,0x23800a04 ,0x23800a04 }, + {0x0000a5ac ,0x33805e44 ,0x33805e44 ,0x26800a20 ,0x26800a20 }, + {0x0000a5b0 ,0x38805e65 ,0x38805e65 ,0x2a800e20 ,0x2a800e20 }, + {0x0000a5b4 ,0x3c805e69 ,0x3c805e69 ,0x2e800e22 ,0x2e800e22 }, + {0x0000a5b8 ,0x40805e6b ,0x40805e6b ,0x31800e24 ,0x31800e24 }, + {0x0000a5bc ,0x44805e6d ,0x44805e6d ,0x34801640 ,0x34801640 }, + {0x0000a5c0 ,0x49805e72 ,0x49805e72 ,0x38801660 ,0x38801660 }, + {0x0000a5c4 ,0x4e805eb2 ,0x4e805eb2 ,0x3b801861 ,0x3b801861 }, + {0x0000a5c8 ,0x53805f12 ,0x53805f12 ,0x3e801a81 ,0x3e801a81 }, + {0x0000a5cc ,0x59825eb2 ,0x59825eb2 ,0x42801a83 ,0x42801a83 }, + {0x0000a5d0 ,0x5e825f12 ,0x5e825f12 ,0x44801c84 ,0x44801c84 }, + {0x0000a5d4 ,0x61827f12 ,0x61827f12 ,0x48801ce3 ,0x48801ce3 }, + {0x0000a5d8 ,0x6782bf12 ,0x6782bf12 ,0x4c801ce5 ,0x4c801ce5 }, + {0x0000a5dc ,0x6b82bf14 ,0x6b82bf14 ,0x50801ce9 ,0x50801ce9 }, + {0x0000a5e0 ,0x6f82bf16 ,0x6f82bf16 ,0x54801ceb ,0x54801ceb }, + {0x0000a5e4 ,0x6f82bf16 ,0x6f82bf16 ,0x56801eec ,0x56801eec }, + {0x0000a5e8 ,0x6f82bf16 ,0x6f82bf16 ,0x56801eec ,0x56801eec }, + {0x0000a5ec ,0x6f82bf16 ,0x6f82bf16 ,0x56801eec ,0x56801eec }, + {0x0000a5f0 ,0x6f82bf16 ,0x6f82bf16 ,0x56801eec ,0x56801eec }, + {0x0000a5f4 ,0x6f82bf16 ,0x6f82bf16 ,0x56801eec ,0x56801eec }, + {0x0000a5f8 ,0x6f82bf16 ,0x6f82bf16 ,0x56801eec ,0x56801eec }, + {0x0000a5fc ,0x6f82bf16 ,0x6f82bf16 ,0x56801eec ,0x56801eec }, + {0x0000a600 ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, + {0x0000a604 ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, + {0x0000a608 ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, + {0x0000a60c ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, + {0x0000a610 ,0x00804000 ,0x00804000 ,0x00000000 ,0x00000000 }, + {0x0000a614 ,0x00804201 ,0x00804201 ,0x01404000 ,0x01404000 }, + {0x0000a618 ,0x0280c802 ,0x0280c802 ,0x01404501 ,0x01404501 }, + {0x0000a61c ,0x0280ca03 ,0x0280ca03 ,0x02008501 ,0x02008501 }, + {0x0000a620 ,0x04c15104 ,0x04c15104 ,0x0280ca03 ,0x0280ca03 }, + {0x0000a624 ,0x04c15305 ,0x04c15305 ,0x03010c04 ,0x03010c04 }, + {0x0000a628 ,0x04c15305 ,0x04c15305 ,0x04014c04 ,0x04014c04 }, + {0x0000a62c ,0x04c15305 ,0x04c15305 ,0x04015005 ,0x04015005 }, + {0x0000a630 ,0x04c15305 ,0x04c15305 ,0x04015005 ,0x04015005 }, + {0x0000a634 ,0x04c15305 ,0x04c15305 ,0x04015005 ,0x04015005 }, + {0x0000a638 ,0x04c15305 ,0x04c15305 ,0x04015005 ,0x04015005 }, + {0x0000a63c ,0x04c15305 ,0x04c15305 ,0x04015005 ,0x04015005 }, + {0x0000b2dc ,0x0380c7fc ,0x0380c7fc ,0x03aaa352 ,0x03aaa352 }, + {0x0000b2e0 ,0x0000f800 ,0x0000f800 ,0x03ccc584 ,0x03ccc584 }, + {0x0000b2e4 ,0x03ff0000 ,0x03ff0000 ,0x03f0f800 ,0x03f0f800 }, + {0x0000b2e8 ,0x00000000 ,0x00000000 ,0x03ff0000 ,0x03ff0000 }, + {0x0000c2dc ,0x0380c7fc ,0x0380c7fc ,0x03aaa352 ,0x03aaa352 }, + {0x0000c2e0 ,0x0000f800 ,0x0000f800 ,0x03ccc584 ,0x03ccc584 }, + {0x0000c2e4 ,0x03ff0000 ,0x03ff0000 ,0x03f0f800 ,0x03f0f800 }, + {0x0000c2e8 ,0x00000000 ,0x00000000 ,0x03ff0000 ,0x03ff0000 }, + {0x00016044 ,0x012492d4 ,0x012492d4 ,0x012492d4 ,0x012492d4 }, + {0x00016048 ,0x66480001 ,0x66480001 ,0x66480001 ,0x66480001 }, + {0x00016068 ,0x6db6db6c ,0x6db6db6c ,0x6db6db6c ,0x6db6db6c }, + {0x00016444 ,0x012492d4 ,0x012492d4 ,0x012492d4 ,0x012492d4 }, + {0x00016448 ,0x66480001 ,0x66480001 ,0x66480001 ,0x66480001 }, + {0x00016468 ,0x6db6db6c ,0x6db6db6c ,0x6db6db6c ,0x6db6db6c }, + {0x00016844 ,0x012492d4 ,0x012492d4 ,0x012492d4 ,0x012492d4 }, + {0x00016848 ,0x66480001 ,0x66480001 ,0x66480001 ,0x66480001 }, + {0x00016868 ,0x6db6db6c ,0x6db6db6c ,0x6db6db6c ,0x6db6db6c }, +}; + +#endif /* INITVALS_9003_BUFFALO_H */
drivers/net/wireless/ath/ath9k/ar9003_hw.c +9 -3
@@ -17,6 +17,7 @@#include "hw.h" #include "ar9003_mac.h" #include "ar9003_2p2_initvals.h" +#include "ar9003_buffalo_initvals.h" #include "ar9485_initvals.h" #include "ar9340_initvals.h" #include "ar9330_1p1_initvals.h"
@@ -592,9 +593,14 @@ static void ar9003_tx_gain_table_mode3(struct ath_hw *ah)else if (AR_SREV_9565 (ah))INIT_INI_ARRAY (&ah->iniModesTxGain, ar9565_1p0_modes_high_power_tx_gain_table); -else -INIT_INI_ARRAY (&ah->iniModesTxGain, - ar9300Modes_high_power_tx_gain_table_2p2); +else { +if (ah->config.tx_gain_buffalo) +INIT_INI_ARRAY (&ah->iniModesTxGain, + ar9300Modes_high_power_tx_gain_table_buffalo); +else +INIT_INI_ARRAY (&ah->iniModesTxGain, + ar9300Modes_high_power_tx_gain_table_2p2); + } }static void ar9003_tx_gain_table_mode4 (struct ath_hw *ah)
drivers/net/wireless/ath/ath9k/hw.h +1 -0
@@ -316,6 +316,7 @@ struct ath9k_ops_config {bool xatten_margin_cfg;bool alt_mingainidx;bool no_pll_pwrsave; +bool tx_gain_buffalo; };enum ath9k_int {
drivers/net/wireless/ath/ath9k/init.c +27 -9
@@ -554,7 +554,7 @@ static void ath9k_init_misc(struct ath_softc *sc) sc->spec_config.fft_period =0xF ; } -static void ath9k_init_platform (struct ath_softc *sc) +static void ath9k_init_pcoem_platform (struct ath_softc *sc) {struct ath_hw *ah = sc->sc_ah;struct ath9k_hw_capabilities *pCap = &ah->caps;
@@ -664,6 +664,27 @@ static void ath9k_eeprom_release(struct ath_softc *sc)release_firmware (sc->sc_ah->eeprom_blob); } +static int ath9k_init_soc_platform (struct ath_softc *sc) +{ +struct ath9k_platform_data *pdata = sc->dev->platform_data; +struct ath_hw *ah = sc->sc_ah; +int ret =0 ; + +if (!pdata) +return 0 ; + +if (pdata->eeprom_name) { + ret =ath9k_eeprom_request (sc, pdata->eeprom_name); +if (ret) +return ret; + } + +if (pdata->tx_gain_buffalo) + ah->config.tx_gain_buffalo = true; + +return ret; +} +static int ath9k_init_softc (u16 devid,struct ath_softc *sc,const struct ath_bus_ops *bus_ops) {
@@ -717,7 +738,11 @@ static int ath9k_init_softc(u16 devid, struct ath_softc *sc,/* * Platform quirks. */ -ath9k_init_platform (sc); +ath9k_init_pcoem_platform (sc); + + ret =ath9k_init_soc_platform (sc); +if (ret) +return ret;/* * Enable WLAN/BT RX Antenna diversity only when:
@@ -731,7 +756,6 @@ static int ath9k_init_softc(u16 devid, struct ath_softc *sc, common->bt_ant_diversity =1 ;spin_lock_init (&common->cc_lock); -spin_lock_init (&sc->sc_serial_rw);spin_lock_init (&sc->sc_pm_lock);mutex_init (&sc->mutex);
@@ -753,12 +777,6 @@ static int ath9k_init_softc(u16 devid, struct ath_softc *sc,ath_read_cachesize (common, &csz); common->cachelsz = csz <<2 ;/* convert to bytes */ -if (pdata && pdata->eeprom_name) { - ret =ath9k_eeprom_request (sc, pdata->eeprom_name); -if (ret) -return ret; - } -/* Initializes the hardware for all supported chipsets */ ret =ath9k_hw_init (ah);if (ret)
include/linux/ath9k_platform.h +2 -0
@@ -32,6 +32,8 @@ struct ath9k_platform_data {u32 gpio_val;bool is_clk_25mhz; +bool tx_gain_buffalo; +int (*get_mac_revision)(void );int (*external_reset)(void ); };
Signature · 1 line
1.8.4.2
PATCH 8/16 ath9k: Update high power gain table for AR9300
In reply to Sujith ManoharanFrom: Sujith Manoharan <[email protected]>
Now that the Buffalo-specific initvals have been moved to a separate array, update the default high power TX gain table for all AR9300 v2.2 devices.
--- .../net/wireless/ath/ath9k/ar9003_2p2_initvals.h | 182 ++++++++++----------- 1 file changed, 91 insertions(+), 91 deletions(-)
drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h +91 -91
@@ -534,107 +534,107 @@ static const u32 ar9300_2p2_baseband_core[][2] = {static const u32 ar9300Modes_high_power_tx_gain_table_2p2[][5 ] = {/* Addr 5G_HT20 5G_HT40 2G_HT40 2G_HT20 */ - {0x0000a2dc ,0x0380c7fc ,0x0380c7fc ,0x03aaa352 ,0x03aaa352 }, - {0x0000a2e0 ,0x0000f800 ,0x0000f800 ,0x03ccc584 ,0x03ccc584 }, - {0x0000a2e4 ,0x03ff0000 ,0x03ff0000 ,0x03f0f800 ,0x03f0f800 }, + {0x0000a2dc ,0x000cfff0 ,0x000cfff0 ,0x03aaa352 ,0x03aaa352 }, + {0x0000a2e0 ,0x000f0000 ,0x000f0000 ,0x03ccc584 ,0x03ccc584 }, + {0x0000a2e4 ,0x03f00000 ,0x03f00000 ,0x03f0f800 ,0x03f0f800 }, {0x0000a2e8 ,0x00000000 ,0x00000000 ,0x03ff0000 ,0x03ff0000 }, - {0x0000a410 ,0x000050d8 ,0x000050d8 ,0x000050d9 ,0x000050d9 }, - {0x0000a500 ,0x00002220 ,0x00002220 ,0x00000000 ,0x00000000 }, - {0x0000a504 ,0x04002222 ,0x04002222 ,0x04000002 ,0x04000002 }, - {0x0000a508 ,0x09002421 ,0x09002421 ,0x08000004 ,0x08000004 }, - {0x0000a50c ,0x0d002621 ,0x0d002621 ,0x0b000200 ,0x0b000200 }, - {0x0000a510 ,0x13004620 ,0x13004620 ,0x0f000202 ,0x0f000202 }, - {0x0000a514 ,0x19004a20 ,0x19004a20 ,0x11000400 ,0x11000400 }, - {0x0000a518 ,0x1d004e20 ,0x1d004e20 ,0x15000402 ,0x15000402 }, - {0x0000a51c ,0x21005420 ,0x21005420 ,0x19000404 ,0x19000404 }, - {0x0000a520 ,0x26005e20 ,0x26005e20 ,0x1b000603 ,0x1b000603 }, - {0x0000a524 ,0x2b005e40 ,0x2b005e40 ,0x1f000a02 ,0x1f000a02 }, - {0x0000a528 ,0x2f005e42 ,0x2f005e42 ,0x23000a04 ,0x23000a04 }, - {0x0000a52c ,0x33005e44 ,0x33005e44 ,0x26000a20 ,0x26000a20 }, - {0x0000a530 ,0x38005e65 ,0x38005e65 ,0x2a000e20 ,0x2a000e20 }, - {0x0000a534 ,0x3c005e69 ,0x3c005e69 ,0x2e000e22 ,0x2e000e22 }, - {0x0000a538 ,0x40005e6b ,0x40005e6b ,0x31000e24 ,0x31000e24 }, - {0x0000a53c ,0x44005e6d ,0x44005e6d ,0x34001640 ,0x34001640 }, - {0x0000a540 ,0x49005e72 ,0x49005e72 ,0x38001660 ,0x38001660 }, - {0x0000a544 ,0x4e005eb2 ,0x4e005eb2 ,0x3b001861 ,0x3b001861 }, - {0x0000a548 ,0x53005f12 ,0x53005f12 ,0x3e001a81 ,0x3e001a81 }, - {0x0000a54c ,0x59025eb2 ,0x59025eb2 ,0x42001a83 ,0x42001a83 }, - {0x0000a550 ,0x5e025f12 ,0x5e025f12 ,0x44001c84 ,0x44001c84 }, - {0x0000a554 ,0x61027f12 ,0x61027f12 ,0x48001ce3 ,0x48001ce3 }, - {0x0000a558 ,0x6702bf12 ,0x6702bf12 ,0x4c001ce5 ,0x4c001ce5 }, - {0x0000a55c ,0x6b02bf14 ,0x6b02bf14 ,0x50001ce9 ,0x50001ce9 }, - {0x0000a560 ,0x6f02bf16 ,0x6f02bf16 ,0x54001ceb ,0x54001ceb }, - {0x0000a564 ,0x6f02bf16 ,0x6f02bf16 ,0x56001eec ,0x56001eec }, - {0x0000a568 ,0x6f02bf16 ,0x6f02bf16 ,0x56001eec ,0x56001eec }, - {0x0000a56c ,0x6f02bf16 ,0x6f02bf16 ,0x56001eec ,0x56001eec }, - {0x0000a570 ,0x6f02bf16 ,0x6f02bf16 ,0x56001eec ,0x56001eec }, - {0x0000a574 ,0x6f02bf16 ,0x6f02bf16 ,0x56001eec ,0x56001eec }, - {0x0000a578 ,0x6f02bf16 ,0x6f02bf16 ,0x56001eec ,0x56001eec }, - {0x0000a57c ,0x6f02bf16 ,0x6f02bf16 ,0x56001eec ,0x56001eec }, - {0x0000a580 ,0x00802220 ,0x00802220 ,0x00800000 ,0x00800000 }, - {0x0000a584 ,0x04802222 ,0x04802222 ,0x04800002 ,0x04800002 }, - {0x0000a588 ,0x09802421 ,0x09802421 ,0x08800004 ,0x08800004 }, - {0x0000a58c ,0x0d802621 ,0x0d802621 ,0x0b800200 ,0x0b800200 }, - {0x0000a590 ,0x13804620 ,0x13804620 ,0x0f800202 ,0x0f800202 }, - {0x0000a594 ,0x19804a20 ,0x19804a20 ,0x11800400 ,0x11800400 }, - {0x0000a598 ,0x1d804e20 ,0x1d804e20 ,0x15800402 ,0x15800402 }, - {0x0000a59c ,0x21805420 ,0x21805420 ,0x19800404 ,0x19800404 }, - {0x0000a5a0 ,0x26805e20 ,0x26805e20 ,0x1b800603 ,0x1b800603 }, - {0x0000a5a4 ,0x2b805e40 ,0x2b805e40 ,0x1f800a02 ,0x1f800a02 }, - {0x0000a5a8 ,0x2f805e42 ,0x2f805e42 ,0x23800a04 ,0x23800a04 }, - {0x0000a5ac ,0x33805e44 ,0x33805e44 ,0x26800a20 ,0x26800a20 }, - {0x0000a5b0 ,0x38805e65 ,0x38805e65 ,0x2a800e20 ,0x2a800e20 }, - {0x0000a5b4 ,0x3c805e69 ,0x3c805e69 ,0x2e800e22 ,0x2e800e22 }, - {0x0000a5b8 ,0x40805e6b ,0x40805e6b ,0x31800e24 ,0x31800e24 }, - {0x0000a5bc ,0x44805e6d ,0x44805e6d ,0x34801640 ,0x34801640 }, - {0x0000a5c0 ,0x49805e72 ,0x49805e72 ,0x38801660 ,0x38801660 }, - {0x0000a5c4 ,0x4e805eb2 ,0x4e805eb2 ,0x3b801861 ,0x3b801861 }, - {0x0000a5c8 ,0x53805f12 ,0x53805f12 ,0x3e801a81 ,0x3e801a81 }, - {0x0000a5cc ,0x59825eb2 ,0x59825eb2 ,0x42801a83 ,0x42801a83 }, - {0x0000a5d0 ,0x5e825f12 ,0x5e825f12 ,0x44801c84 ,0x44801c84 }, - {0x0000a5d4 ,0x61827f12 ,0x61827f12 ,0x48801ce3 ,0x48801ce3 }, - {0x0000a5d8 ,0x6782bf12 ,0x6782bf12 ,0x4c801ce5 ,0x4c801ce5 }, - {0x0000a5dc ,0x6b82bf14 ,0x6b82bf14 ,0x50801ce9 ,0x50801ce9 }, - {0x0000a5e0 ,0x6f82bf16 ,0x6f82bf16 ,0x54801ceb ,0x54801ceb }, - {0x0000a5e4 ,0x6f82bf16 ,0x6f82bf16 ,0x56801eec ,0x56801eec }, - {0x0000a5e8 ,0x6f82bf16 ,0x6f82bf16 ,0x56801eec ,0x56801eec }, - {0x0000a5ec ,0x6f82bf16 ,0x6f82bf16 ,0x56801eec ,0x56801eec }, - {0x0000a5f0 ,0x6f82bf16 ,0x6f82bf16 ,0x56801eec ,0x56801eec }, - {0x0000a5f4 ,0x6f82bf16 ,0x6f82bf16 ,0x56801eec ,0x56801eec }, - {0x0000a5f8 ,0x6f82bf16 ,0x6f82bf16 ,0x56801eec ,0x56801eec }, - {0x0000a5fc ,0x6f82bf16 ,0x6f82bf16 ,0x56801eec ,0x56801eec }, + {0x0000a410 ,0x000050d9 ,0x000050d9 ,0x000050d9 ,0x000050d9 }, + {0x0000a500 ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, + {0x0000a504 ,0x06000003 ,0x06000003 ,0x04000002 ,0x04000002 }, + {0x0000a508 ,0x0a000020 ,0x0a000020 ,0x08000004 ,0x08000004 }, + {0x0000a50c ,0x10000023 ,0x10000023 ,0x0b000200 ,0x0b000200 }, + {0x0000a510 ,0x15000028 ,0x15000028 ,0x0f000202 ,0x0f000202 }, + {0x0000a514 ,0x1b00002b ,0x1b00002b ,0x12000400 ,0x12000400 }, + {0x0000a518 ,0x1f020028 ,0x1f020028 ,0x16000402 ,0x16000402 }, + {0x0000a51c ,0x2502002b ,0x2502002b ,0x19000404 ,0x19000404 }, + {0x0000a520 ,0x2a04002a ,0x2a04002a ,0x1c000603 ,0x1c000603 }, + {0x0000a524 ,0x2e06002a ,0x2e06002a ,0x21000a02 ,0x21000a02 }, + {0x0000a528 ,0x3302202d ,0x3302202d ,0x25000a04 ,0x25000a04 }, + {0x0000a52c ,0x3804202c ,0x3804202c ,0x28000a20 ,0x28000a20 }, + {0x0000a530 ,0x3c06202c ,0x3c06202c ,0x2c000e20 ,0x2c000e20 }, + {0x0000a534 ,0x4108202d ,0x4108202d ,0x30000e22 ,0x30000e22 }, + {0x0000a538 ,0x4506402d ,0x4506402d ,0x34000e24 ,0x34000e24 }, + {0x0000a53c ,0x4906222d ,0x4906222d ,0x38001640 ,0x38001640 }, + {0x0000a540 ,0x4d062231 ,0x4d062231 ,0x3c001660 ,0x3c001660 }, + {0x0000a544 ,0x50082231 ,0x50082231 ,0x3f001861 ,0x3f001861 }, + {0x0000a548 ,0x5608422e ,0x5608422e ,0x43001a81 ,0x43001a81 }, + {0x0000a54c ,0x5e08442e ,0x5e08442e ,0x47001a83 ,0x47001a83 }, + {0x0000a550 ,0x620a4431 ,0x620a4431 ,0x4a001c84 ,0x4a001c84 }, + {0x0000a554 ,0x640a4432 ,0x640a4432 ,0x4e001ce3 ,0x4e001ce3 }, + {0x0000a558 ,0x680a4434 ,0x680a4434 ,0x52001ce5 ,0x52001ce5 }, + {0x0000a55c ,0x6c0a6434 ,0x6c0a6434 ,0x56001ce9 ,0x56001ce9 }, + {0x0000a560 ,0x6f0a6633 ,0x6f0a6633 ,0x5a001ceb ,0x5a001ceb }, + {0x0000a564 ,0x730c6634 ,0x730c6634 ,0x5d001eec ,0x5d001eec }, + {0x0000a568 ,0x730c6634 ,0x730c6634 ,0x5d001eec ,0x5d001eec }, + {0x0000a56c ,0x730c6634 ,0x730c6634 ,0x5d001eec ,0x5d001eec }, + {0x0000a570 ,0x730c6634 ,0x730c6634 ,0x5d001eec ,0x5d001eec }, + {0x0000a574 ,0x730c6634 ,0x730c6634 ,0x5d001eec ,0x5d001eec }, + {0x0000a578 ,0x730c6634 ,0x730c6634 ,0x5d001eec ,0x5d001eec }, + {0x0000a57c ,0x730c6634 ,0x730c6634 ,0x5d001eec ,0x5d001eec }, + {0x0000a580 ,0x00800000 ,0x00800000 ,0x00800000 ,0x00800000 }, + {0x0000a584 ,0x06800003 ,0x06800003 ,0x04800002 ,0x04800002 }, + {0x0000a588 ,0x0a800020 ,0x0a800020 ,0x08800004 ,0x08800004 }, + {0x0000a58c ,0x10800023 ,0x10800023 ,0x0b800200 ,0x0b800200 }, + {0x0000a590 ,0x15800028 ,0x15800028 ,0x0f800202 ,0x0f800202 }, + {0x0000a594 ,0x1b80002b ,0x1b80002b ,0x12800400 ,0x12800400 }, + {0x0000a598 ,0x1f820028 ,0x1f820028 ,0x16800402 ,0x16800402 }, + {0x0000a59c ,0x2582002b ,0x2582002b ,0x19800404 ,0x19800404 }, + {0x0000a5a0 ,0x2a84002a ,0x2a84002a ,0x1c800603 ,0x1c800603 }, + {0x0000a5a4 ,0x2e86002a ,0x2e86002a ,0x21800a02 ,0x21800a02 }, + {0x0000a5a8 ,0x3382202d ,0x3382202d ,0x25800a04 ,0x25800a04 }, + {0x0000a5ac ,0x3884202c ,0x3884202c ,0x28800a20 ,0x28800a20 }, + {0x0000a5b0 ,0x3c86202c ,0x3c86202c ,0x2c800e20 ,0x2c800e20 }, + {0x0000a5b4 ,0x4188202d ,0x4188202d ,0x30800e22 ,0x30800e22 }, + {0x0000a5b8 ,0x4586402d ,0x4586402d ,0x34800e24 ,0x34800e24 }, + {0x0000a5bc ,0x4986222d ,0x4986222d ,0x38801640 ,0x38801640 }, + {0x0000a5c0 ,0x4d862231 ,0x4d862231 ,0x3c801660 ,0x3c801660 }, + {0x0000a5c4 ,0x50882231 ,0x50882231 ,0x3f801861 ,0x3f801861 }, + {0x0000a5c8 ,0x5688422e ,0x5688422e ,0x43801a81 ,0x43801a81 }, + {0x0000a5cc ,0x5e88442e ,0x5e88442e ,0x47801a83 ,0x47801a83 }, + {0x0000a5d0 ,0x628a4431 ,0x628a4431 ,0x4a801c84 ,0x4a801c84 }, + {0x0000a5d4 ,0x648a4432 ,0x648a4432 ,0x4e801ce3 ,0x4e801ce3 }, + {0x0000a5d8 ,0x688a4434 ,0x688a4434 ,0x52801ce5 ,0x52801ce5 }, + {0x0000a5dc ,0x6c8a6434 ,0x6c8a6434 ,0x56801ce9 ,0x56801ce9 }, + {0x0000a5e0 ,0x6f8a6633 ,0x6f8a6633 ,0x5a801ceb ,0x5a801ceb }, + {0x0000a5e4 ,0x738c6634 ,0x738c6634 ,0x5d801eec ,0x5d801eec }, + {0x0000a5e8 ,0x738c6634 ,0x738c6634 ,0x5d801eec ,0x5d801eec }, + {0x0000a5ec ,0x738c6634 ,0x738c6634 ,0x5d801eec ,0x5d801eec }, + {0x0000a5f0 ,0x738c6634 ,0x738c6634 ,0x5d801eec ,0x5d801eec }, + {0x0000a5f4 ,0x738c6634 ,0x738c6634 ,0x5d801eec ,0x5d801eec }, + {0x0000a5f8 ,0x738c6634 ,0x738c6634 ,0x5d801eec ,0x5d801eec }, + {0x0000a5fc ,0x738c6634 ,0x738c6634 ,0x5d801eec ,0x5d801eec }, {0x0000a600 ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, {0x0000a604 ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, - {0x0000a608 ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, - {0x0000a60c ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, - {0x0000a610 ,0x00804000 ,0x00804000 ,0x00000000 ,0x00000000 }, - {0x0000a614 ,0x00804201 ,0x00804201 ,0x01404000 ,0x01404000 }, - {0x0000a618 ,0x0280c802 ,0x0280c802 ,0x01404501 ,0x01404501 }, - {0x0000a61c ,0x0280ca03 ,0x0280ca03 ,0x02008501 ,0x02008501 }, - {0x0000a620 ,0x04c15104 ,0x04c15104 ,0x0280ca03 ,0x0280ca03 }, - {0x0000a624 ,0x04c15305 ,0x04c15305 ,0x03010c04 ,0x03010c04 }, - {0x0000a628 ,0x04c15305 ,0x04c15305 ,0x04014c04 ,0x04014c04 }, - {0x0000a62c ,0x04c15305 ,0x04c15305 ,0x04015005 ,0x04015005 }, - {0x0000a630 ,0x04c15305 ,0x04c15305 ,0x04015005 ,0x04015005 }, - {0x0000a634 ,0x04c15305 ,0x04c15305 ,0x04015005 ,0x04015005 }, - {0x0000a638 ,0x04c15305 ,0x04c15305 ,0x04015005 ,0x04015005 }, - {0x0000a63c ,0x04c15305 ,0x04c15305 ,0x04015005 ,0x04015005 }, - {0x0000b2dc ,0x0380c7fc ,0x0380c7fc ,0x03aaa352 ,0x03aaa352 }, - {0x0000b2e0 ,0x0000f800 ,0x0000f800 ,0x03ccc584 ,0x03ccc584 }, - {0x0000b2e4 ,0x03ff0000 ,0x03ff0000 ,0x03f0f800 ,0x03f0f800 }, + {0x0000a608 ,0x01804601 ,0x01804601 ,0x00000000 ,0x00000000 }, + {0x0000a60c ,0x01804601 ,0x01804601 ,0x00000000 ,0x00000000 }, + {0x0000a610 ,0x01804601 ,0x01804601 ,0x00000000 ,0x00000000 }, + {0x0000a614 ,0x01804601 ,0x01804601 ,0x01404000 ,0x01404000 }, + {0x0000a618 ,0x01804601 ,0x01804601 ,0x01404501 ,0x01404501 }, + {0x0000a61c ,0x01804601 ,0x01804601 ,0x02008501 ,0x02008501 }, + {0x0000a620 ,0x03408d02 ,0x03408d02 ,0x0280ca03 ,0x0280ca03 }, + {0x0000a624 ,0x0300cc03 ,0x0300cc03 ,0x03010c04 ,0x03010c04 }, + {0x0000a628 ,0x03410d04 ,0x03410d04 ,0x04014c04 ,0x04014c04 }, + {0x0000a62c ,0x03410d04 ,0x03410d04 ,0x04015005 ,0x04015005 }, + {0x0000a630 ,0x03410d04 ,0x03410d04 ,0x04015005 ,0x04015005 }, + {0x0000a634 ,0x03410d04 ,0x03410d04 ,0x04015005 ,0x04015005 }, + {0x0000a638 ,0x03410d04 ,0x03410d04 ,0x04015005 ,0x04015005 }, + {0x0000a63c ,0x03410d04 ,0x03410d04 ,0x04015005 ,0x04015005 }, + {0x0000b2dc ,0x000cfff0 ,0x000cfff0 ,0x03aaa352 ,0x03aaa352 }, + {0x0000b2e0 ,0x000f0000 ,0x000f0000 ,0x03ccc584 ,0x03ccc584 }, + {0x0000b2e4 ,0x03f00000 ,0x03f00000 ,0x03f0f800 ,0x03f0f800 }, {0x0000b2e8 ,0x00000000 ,0x00000000 ,0x03ff0000 ,0x03ff0000 }, - {0x0000c2dc ,0x0380c7fc ,0x0380c7fc ,0x03aaa352 ,0x03aaa352 }, - {0x0000c2e0 ,0x0000f800 ,0x0000f800 ,0x03ccc584 ,0x03ccc584 }, - {0x0000c2e4 ,0x03ff0000 ,0x03ff0000 ,0x03f0f800 ,0x03f0f800 }, + {0x0000c2dc ,0x000cfff0 ,0x000cfff0 ,0x03aaa352 ,0x03aaa352 }, + {0x0000c2e0 ,0x000f0000 ,0x000f0000 ,0x03ccc584 ,0x03ccc584 }, + {0x0000c2e4 ,0x03f00000 ,0x03f00000 ,0x03f0f800 ,0x03f0f800 }, {0x0000c2e8 ,0x00000000 ,0x00000000 ,0x03ff0000 ,0x03ff0000 }, {0x00016044 ,0x012492d4 ,0x012492d4 ,0x012492d4 ,0x012492d4 }, - {0x00016048 ,0x66480001 ,0x66480001 ,0x66480001 ,0x66480001 }, + {0x00016048 ,0x61200001 ,0x61200001 ,0x66480001 ,0x66480001 }, {0x00016068 ,0x6db6db6c ,0x6db6db6c ,0x6db6db6c ,0x6db6db6c }, {0x00016444 ,0x012492d4 ,0x012492d4 ,0x012492d4 ,0x012492d4 }, - {0x00016448 ,0x66480001 ,0x66480001 ,0x66480001 ,0x66480001 }, + {0x00016448 ,0x61200001 ,0x61200001 ,0x66480001 ,0x66480001 }, {0x00016468 ,0x6db6db6c ,0x6db6db6c ,0x6db6db6c ,0x6db6db6c }, {0x00016844 ,0x012492d4 ,0x012492d4 ,0x012492d4 ,0x012492d4 }, - {0x00016848 ,0x66480001 ,0x66480001 ,0x66480001 ,0x66480001 }, + {0x00016848 ,0x61200001 ,0x61200001 ,0x66480001 ,0x66480001 }, {0x00016868 ,0x6db6db6c ,0x6db6db6c ,0x6db6db6c ,0x6db6db6c }, };
Signature · 1 line
1.8.4.2
PATCH 9/16 ath9k: Identify duplicate AR9485 initvals
In reply to Sujith ManoharanFrom: Sujith Manoharan <[email protected]>
--- drivers/net/wireless/ath/ath9k/ar9485_initvals.h | 117 +---------------------- 1 file changed, 5 insertions(+), 112 deletions(-)
drivers/net/wireless/ath/ath9k/ar9485_initvals.h +5 -112
@@ -20,17 +20,11 @@/* AR9485 1.1 */ -static const u32 ar9485_1_1_mac_postamble[][5 ] = { -/* Addr 5G_HT20 5G_HT40 2G_HT40 2G_HT20 */ - {0x00001030 ,0x00000230 ,0x00000460 ,0x000002c0 ,0x00000160 }, - {0x00001070 ,0x00000168 ,0x000002d0 ,0x00000318 ,0x0000018c }, - {0x000010b0 ,0x00000e60 ,0x00001cc0 ,0x00007c70 ,0x00003e38 }, - {0x00008014 ,0x03e803e8 ,0x07d007d0 ,0x10801600 ,0x08400b00 }, - {0x0000801c ,0x128d8027 ,0x128d804f ,0x12e00057 ,0x12e0002b }, - {0x00008120 ,0x08f04800 ,0x08f04800 ,0x08f04810 ,0x08f04810 }, - {0x000081d0 ,0x00003210 ,0x00003210 ,0x0000320a ,0x0000320a }, - {0x00008318 ,0x00003e80 ,0x00007d00 ,0x00006880 ,0x00003440 }, -}; +#define ar9485_modes_lowest_ob_db_tx_gain_1_1 ar9485Modes_low_ob_db_tx_gain_1_1 + +#define ar9485_1_1_mac_postamble ar9331_1p1_mac_postamble + +#define ar9485_1_1_baseband_core_txfir_coeff_japan_2484 ar9300_2p2_baseband_core_txfir_coeff_japan_2484static const u32 ar9485Common_wo_xlna_rx_gain_1_1[][2 ] = {/* Addr allmodes */
@@ -546,100 +540,6 @@ static const u32 ar9485Modes_low_ob_db_tx_gain_1_1[][5] = { {0x00016048, 0x6c924260, 0x6c924260, 0x6c924260, 0x6c924260}, }; -static const u32 ar9485_modes_lowest_ob_db_tx_gain_1_1[][5 ] = { -/* Addr 5G_HT20 5G_HT40 2G_HT40 2G_HT20 */ - {0x000098bc ,0x00000002 ,0x00000002 ,0x00000002 ,0x00000002 }, - {0x0000a2d8 ,0xf999a83a ,0xf999a83a ,0x7999a83a ,0x7999a83a }, - {0x0000a2dc ,0x00000000 ,0x00000000 ,0xfe2d3552 ,0xfe2d3552 }, - {0x0000a2e0 ,0x00000000 ,0x00000000 ,0xfe2d3552 ,0xfe2d3552 }, - {0x0000a2e4 ,0x00000000 ,0x00000000 ,0xfe2d3552 ,0xfe2d3552 }, - {0x0000a2e8 ,0x00000000 ,0x00000000 ,0xfe2d3552 ,0xfe2d3552 }, - {0x0000a410 ,0x000050d9 ,0x000050d9 ,0x000050d8 ,0x000050d8 }, - {0x0000a458 ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, - {0x0000a500 ,0x00022200 ,0x00022200 ,0x00000000 ,0x00000000 }, - {0x0000a504 ,0x05062002 ,0x05062002 ,0x04000002 ,0x04000002 }, - {0x0000a508 ,0x0c002e00 ,0x0c002e00 ,0x08000004 ,0x08000004 }, - {0x0000a50c ,0x11062202 ,0x11062202 ,0x0d000200 ,0x0d000200 }, - {0x0000a510 ,0x17022e00 ,0x17022e00 ,0x11000202 ,0x11000202 }, - {0x0000a514 ,0x1d000ec2 ,0x1d000ec2 ,0x15000400 ,0x15000400 }, - {0x0000a518 ,0x25020ec0 ,0x25020ec0 ,0x19000402 ,0x19000402 }, - {0x0000a51c ,0x2b020ec3 ,0x2b020ec3 ,0x1d000404 ,0x1d000404 }, - {0x0000a520 ,0x2f001f04 ,0x2f001f04 ,0x21000603 ,0x21000603 }, - {0x0000a524 ,0x35001fc4 ,0x35001fc4 ,0x25000605 ,0x25000605 }, - {0x0000a528 ,0x3c022f04 ,0x3c022f04 ,0x2a000a03 ,0x2a000a03 }, - {0x0000a52c ,0x41023e85 ,0x41023e85 ,0x2c000a04 ,0x2c000a04 }, - {0x0000a530 ,0x48023ec6 ,0x48023ec6 ,0x34000e20 ,0x34000e20 }, - {0x0000a534 ,0x4d023f01 ,0x4d023f01 ,0x35000e21 ,0x35000e21 }, - {0x0000a538 ,0x53023f4b ,0x53023f4b ,0x43000e62 ,0x43000e62 }, - {0x0000a53c ,0x5a027f09 ,0x5a027f09 ,0x45000e63 ,0x45000e63 }, - {0x0000a540 ,0x5f027fc9 ,0x5f027fc9 ,0x49000e65 ,0x49000e65 }, - {0x0000a544 ,0x6502feca ,0x6502feca ,0x4b000e66 ,0x4b000e66 }, - {0x0000a548 ,0x6b02ff4a ,0x6b02ff4a ,0x4d001645 ,0x4d001645 }, - {0x0000a54c ,0x7203feca ,0x7203feca ,0x51001865 ,0x51001865 }, - {0x0000a550 ,0x7703ff0b ,0x7703ff0b ,0x55001a86 ,0x55001a86 }, - {0x0000a554 ,0x7d06ffcb ,0x7d06ffcb ,0x57001ce9 ,0x57001ce9 }, - {0x0000a558 ,0x8407ff0b ,0x8407ff0b ,0x5a001ceb ,0x5a001ceb }, - {0x0000a55c ,0x8907ffcb ,0x8907ffcb ,0x5e001eeb ,0x5e001eeb }, - {0x0000a560 ,0x900fff0b ,0x900fff0b ,0x5e001eeb ,0x5e001eeb }, - {0x0000a564 ,0x960fffcb ,0x960fffcb ,0x5e001eeb ,0x5e001eeb }, - {0x0000a568 ,0x9c1fff0b ,0x9c1fff0b ,0x5e001eeb ,0x5e001eeb }, - {0x0000a56c ,0x9c1fff0b ,0x9c1fff0b ,0x5e001eeb ,0x5e001eeb }, - {0x0000a570 ,0x9c1fff0b ,0x9c1fff0b ,0x5e001eeb ,0x5e001eeb }, - {0x0000a574 ,0x9c1fff0b ,0x9c1fff0b ,0x5e001eeb ,0x5e001eeb }, - {0x0000a578 ,0x9c1fff0b ,0x9c1fff0b ,0x5e001eeb ,0x5e001eeb }, - {0x0000a57c ,0x9c1fff0b ,0x9c1fff0b ,0x5e001eeb ,0x5e001eeb }, - {0x0000a580 ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, - {0x0000a584 ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, - {0x0000a588 ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, - {0x0000a58c ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, - {0x0000a590 ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, - {0x0000a594 ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, - {0x0000a598 ,0x00000000 ,0x00000000 ,0x01404501 ,0x01404501 }, - {0x0000a59c ,0x00000000 ,0x00000000 ,0x02808a02 ,0x02808a02 }, - {0x0000a5a0 ,0x00000000 ,0x00000000 ,0x02808a02 ,0x02808a02 }, - {0x0000a5a4 ,0x00000000 ,0x00000000 ,0x02808803 ,0x02808803 }, - {0x0000a5a8 ,0x00000000 ,0x00000000 ,0x04c14b04 ,0x04c14b04 }, - {0x0000a5ac ,0x00000000 ,0x00000000 ,0x04c15305 ,0x04c15305 }, - {0x0000a5b0 ,0x00000000 ,0x00000000 ,0x04c15305 ,0x04c15305 }, - {0x0000a5b4 ,0x00000000 ,0x00000000 ,0x04c15305 ,0x04c15305 }, - {0x0000a5b8 ,0x00000000 ,0x00000000 ,0x04c15305 ,0x04c15305 }, - {0x0000a5bc ,0x00000000 ,0x00000000 ,0x04c15305 ,0x04c15305 }, - {0x0000b500 ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, - {0x0000b504 ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, - {0x0000b508 ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, - {0x0000b50c ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, - {0x0000b510 ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, - {0x0000b514 ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, - {0x0000b518 ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, - {0x0000b51c ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, - {0x0000b520 ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, - {0x0000b524 ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, - {0x0000b528 ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, - {0x0000b52c ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, - {0x0000b530 ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, - {0x0000b534 ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, - {0x0000b538 ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, - {0x0000b53c ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, - {0x0000b540 ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, - {0x0000b544 ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, - {0x0000b548 ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, - {0x0000b54c ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, - {0x0000b550 ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, - {0x0000b554 ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, - {0x0000b558 ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, - {0x0000b55c ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, - {0x0000b560 ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, - {0x0000b564 ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, - {0x0000b568 ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, - {0x0000b56c ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, - {0x0000b570 ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, - {0x0000b574 ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, - {0x0000b578 ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, - {0x0000b57c ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, - {0x00016044 ,0x05d6b2db ,0x05d6b2db ,0x05d6b2db ,0x05d6b2db }, - {0x00016048 ,0x6c924260 ,0x6c924260 ,0x6c924260 ,0x6c924260 }, -}; -static const u32 ar9485Modes_green_spur_ob_db_tx_gain_1_1[][5 ] = {/* Addr 5G_HT20 5G_HT40 2G_HT40 2G_HT20 */ {0x000098bc, 0x00000003, 0x00000003, 0x00000003, 0x00000003},
@@ -1323,13 +1223,6 @@ static const u32 ar9485_1_1_mac_core[][2] = { {0x000083d0, 0x000301ff}, }; -static const u32 ar9485_1_1_baseband_core_txfir_coeff_japan_2484[][2 ] = { -/* Addr allmodes */ - {0x0000a398 ,0x00000000 }, - {0x0000a39c ,0x6f7f0301 }, - {0x0000a3a0 ,0xca9228ee }, -}; -static const u32 ar9485_1_1_pcie_phy_clkreq_disable_L1[][2 ] = {/* Addr allmodes */ {0x00018c00, 0x18013e5e},
Signature · 1 line
1.8.4.2
PATCH 10/16 ath9k: Identify duplicate AR9462 v2.0 initvals
In reply to Sujith ManoharanFrom: Sujith Manoharan <[email protected]>
--- .../net/wireless/ath/ath9k/ar9462_2p0_initvals.h | 697 +++------------------ 1 file changed, 83 insertions(+), 614 deletions(-)
drivers/net/wireless/ath/ath9k/ar9462_2p0_initvals.h +83 -614
@@ -20,6 +20,14 @@/* AR9462 2.0 */ +#define ar9462_2p0_mac_postamble ar9331_1p1_mac_postamble + +#define ar9462_2p0_common_wo_xlna_rx_gain ar9300Common_wo_xlna_rx_gain_table_2p2 + +#define ar9462_2p0_common_5g_xlna_only_rxgain ar9462_2p0_common_mixed_rx_gain + +#define ar9462_2p0_baseband_core_txfir_coeff_japan_2484 ar9300_2p2_baseband_core_txfir_coeff_japan_2484 +static const u32 ar9462_2p0_modes_fast_clock[][3 ] = {/* Addr 5G_HT20 5G_HT40 */ {0x00001030 ,0x00000268 ,0x000004d0 },
@@ -366,348 +374,81 @@ static const u32 ar9462_2p0_radio_postamble_sys2ant[][5] = { {0x00016540, 0x10804008, 0x10804008, 0x50804008, 0x50804008}, }; -static const u32 ar9462_2p0_common_wo_xlna_rx_gain[][2 ] = { -/* Addr allmodes */ - {0x0000a000 ,0x00010000 }, - {0x0000a004 ,0x00030002 }, - {0x0000a008 ,0x00050004 }, - {0x0000a00c ,0x00810080 }, - {0x0000a010 ,0x00830082 }, - {0x0000a014 ,0x01810180 }, - {0x0000a018 ,0x01830182 }, - {0x0000a01c ,0x01850184 }, - {0x0000a020 ,0x01890188 }, - {0x0000a024 ,0x018b018a }, - {0x0000a028 ,0x018d018c }, - {0x0000a02c ,0x03820190 }, - {0x0000a030 ,0x03840383 }, - {0x0000a034 ,0x03880385 }, - {0x0000a038 ,0x038a0389 }, - {0x0000a03c ,0x038c038b }, - {0x0000a040 ,0x0390038d }, - {0x0000a044 ,0x03920391 }, - {0x0000a048 ,0x03940393 }, - {0x0000a04c ,0x03960395 }, - {0x0000a050 ,0x00000000 }, - {0x0000a054 ,0x00000000 }, - {0x0000a058 ,0x00000000 }, - {0x0000a05c ,0x00000000 }, - {0x0000a060 ,0x00000000 }, - {0x0000a064 ,0x00000000 }, - {0x0000a068 ,0x00000000 }, - {0x0000a06c ,0x00000000 }, - {0x0000a070 ,0x00000000 }, - {0x0000a074 ,0x00000000 }, - {0x0000a078 ,0x00000000 }, - {0x0000a07c ,0x00000000 }, - {0x0000a080 ,0x29292929 }, - {0x0000a084 ,0x29292929 }, - {0x0000a088 ,0x29292929 }, - {0x0000a08c ,0x29292929 }, - {0x0000a090 ,0x22292929 }, - {0x0000a094 ,0x1d1d2222 }, - {0x0000a098 ,0x0c111117 }, - {0x0000a09c ,0x00030303 }, - {0x0000a0a0 ,0x00000000 }, - {0x0000a0a4 ,0x00000000 }, - {0x0000a0a8 ,0x00000000 }, - {0x0000a0ac ,0x00000000 }, - {0x0000a0b0 ,0x00000000 }, - {0x0000a0b4 ,0x00000000 }, - {0x0000a0b8 ,0x00000000 }, - {0x0000a0bc ,0x00000000 }, - {0x0000a0c0 ,0x001f0000 }, - {0x0000a0c4 ,0x01000101 }, - {0x0000a0c8 ,0x011e011f }, - {0x0000a0cc ,0x011c011d }, - {0x0000a0d0 ,0x02030204 }, - {0x0000a0d4 ,0x02010202 }, - {0x0000a0d8 ,0x021f0200 }, - {0x0000a0dc ,0x0302021e }, - {0x0000a0e0 ,0x03000301 }, - {0x0000a0e4 ,0x031e031f }, - {0x0000a0e8 ,0x0402031d }, - {0x0000a0ec ,0x04000401 }, - {0x0000a0f0 ,0x041e041f }, - {0x0000a0f4 ,0x0502041d }, - {0x0000a0f8 ,0x05000501 }, - {0x0000a0fc ,0x051e051f }, - {0x0000a100 ,0x06010602 }, - {0x0000a104 ,0x061f0600 }, - {0x0000a108 ,0x061d061e }, - {0x0000a10c ,0x07020703 }, - {0x0000a110 ,0x07000701 }, - {0x0000a114 ,0x00000000 }, - {0x0000a118 ,0x00000000 }, - {0x0000a11c ,0x00000000 }, - {0x0000a120 ,0x00000000 }, - {0x0000a124 ,0x00000000 }, - {0x0000a128 ,0x00000000 }, - {0x0000a12c ,0x00000000 }, - {0x0000a130 ,0x00000000 }, - {0x0000a134 ,0x00000000 }, - {0x0000a138 ,0x00000000 }, - {0x0000a13c ,0x00000000 }, - {0x0000a140 ,0x001f0000 }, - {0x0000a144 ,0x01000101 }, - {0x0000a148 ,0x011e011f }, - {0x0000a14c ,0x011c011d }, - {0x0000a150 ,0x02030204 }, - {0x0000a154 ,0x02010202 }, - {0x0000a158 ,0x021f0200 }, - {0x0000a15c ,0x0302021e }, - {0x0000a160 ,0x03000301 }, - {0x0000a164 ,0x031e031f }, - {0x0000a168 ,0x0402031d }, - {0x0000a16c ,0x04000401 }, - {0x0000a170 ,0x041e041f }, - {0x0000a174 ,0x0502041d }, - {0x0000a178 ,0x05000501 }, - {0x0000a17c ,0x051e051f }, - {0x0000a180 ,0x06010602 }, - {0x0000a184 ,0x061f0600 }, - {0x0000a188 ,0x061d061e }, - {0x0000a18c ,0x07020703 }, - {0x0000a190 ,0x07000701 }, - {0x0000a194 ,0x00000000 }, - {0x0000a198 ,0x00000000 }, - {0x0000a19c ,0x00000000 }, - {0x0000a1a0 ,0x00000000 }, - {0x0000a1a4 ,0x00000000 }, - {0x0000a1a8 ,0x00000000 }, - {0x0000a1ac ,0x00000000 }, - {0x0000a1b0 ,0x00000000 }, - {0x0000a1b4 ,0x00000000 }, - {0x0000a1b8 ,0x00000000 }, - {0x0000a1bc ,0x00000000 }, - {0x0000a1c0 ,0x00000000 }, - {0x0000a1c4 ,0x00000000 }, - {0x0000a1c8 ,0x00000000 }, - {0x0000a1cc ,0x00000000 }, - {0x0000a1d0 ,0x00000000 }, - {0x0000a1d4 ,0x00000000 }, - {0x0000a1d8 ,0x00000000 }, - {0x0000a1dc ,0x00000000 }, - {0x0000a1e0 ,0x00000000 }, - {0x0000a1e4 ,0x00000000 }, - {0x0000a1e8 ,0x00000000 }, - {0x0000a1ec ,0x00000000 }, - {0x0000a1f0 ,0x00000396 }, - {0x0000a1f4 ,0x00000396 }, - {0x0000a1f8 ,0x00000396 }, - {0x0000a1fc ,0x00000196 }, - {0x0000b000 ,0x00010000 }, - {0x0000b004 ,0x00030002 }, - {0x0000b008 ,0x00050004 }, - {0x0000b00c ,0x00810080 }, - {0x0000b010 ,0x00830082 }, - {0x0000b014 ,0x01810180 }, - {0x0000b018 ,0x01830182 }, - {0x0000b01c ,0x01850184 }, - {0x0000b020 ,0x02810280 }, - {0x0000b024 ,0x02830282 }, - {0x0000b028 ,0x02850284 }, - {0x0000b02c ,0x02890288 }, - {0x0000b030 ,0x028b028a }, - {0x0000b034 ,0x0388028c }, - {0x0000b038 ,0x038a0389 }, - {0x0000b03c ,0x038c038b }, - {0x0000b040 ,0x0390038d }, - {0x0000b044 ,0x03920391 }, - {0x0000b048 ,0x03940393 }, - {0x0000b04c ,0x03960395 }, - {0x0000b050 ,0x00000000 }, - {0x0000b054 ,0x00000000 }, - {0x0000b058 ,0x00000000 }, - {0x0000b05c ,0x00000000 }, - {0x0000b060 ,0x00000000 }, - {0x0000b064 ,0x00000000 }, - {0x0000b068 ,0x00000000 }, - {0x0000b06c ,0x00000000 }, - {0x0000b070 ,0x00000000 }, - {0x0000b074 ,0x00000000 }, - {0x0000b078 ,0x00000000 }, - {0x0000b07c ,0x00000000 }, - {0x0000b080 ,0x32323232 }, - {0x0000b084 ,0x2f2f3232 }, - {0x0000b088 ,0x23282a2d }, - {0x0000b08c ,0x1c1e2123 }, - {0x0000b090 ,0x14171919 }, - {0x0000b094 ,0x0e0e1214 }, - {0x0000b098 ,0x03050707 }, - {0x0000b09c ,0x00030303 }, - {0x0000b0a0 ,0x00000000 }, - {0x0000b0a4 ,0x00000000 }, - {0x0000b0a8 ,0x00000000 }, - {0x0000b0ac ,0x00000000 }, - {0x0000b0b0 ,0x00000000 }, - {0x0000b0b4 ,0x00000000 }, - {0x0000b0b8 ,0x00000000 }, - {0x0000b0bc ,0x00000000 }, - {0x0000b0c0 ,0x003f0020 }, - {0x0000b0c4 ,0x00400041 }, - {0x0000b0c8 ,0x0140005f }, - {0x0000b0cc ,0x0160015f }, - {0x0000b0d0 ,0x017e017f }, - {0x0000b0d4 ,0x02410242 }, - {0x0000b0d8 ,0x025f0240 }, - {0x0000b0dc ,0x027f0260 }, - {0x0000b0e0 ,0x0341027e }, - {0x0000b0e4 ,0x035f0340 }, - {0x0000b0e8 ,0x037f0360 }, - {0x0000b0ec ,0x04400441 }, - {0x0000b0f0 ,0x0460045f }, - {0x0000b0f4 ,0x0541047f }, - {0x0000b0f8 ,0x055f0540 }, - {0x0000b0fc ,0x057f0560 }, - {0x0000b100 ,0x06400641 }, - {0x0000b104 ,0x0660065f }, - {0x0000b108 ,0x067e067f }, - {0x0000b10c ,0x07410742 }, - {0x0000b110 ,0x075f0740 }, - {0x0000b114 ,0x077f0760 }, - {0x0000b118 ,0x07800781 }, - {0x0000b11c ,0x07a0079f }, - {0x0000b120 ,0x07c107bf }, - {0x0000b124 ,0x000007c0 }, - {0x0000b128 ,0x00000000 }, - {0x0000b12c ,0x00000000 }, - {0x0000b130 ,0x00000000 }, - {0x0000b134 ,0x00000000 }, - {0x0000b138 ,0x00000000 }, - {0x0000b13c ,0x00000000 }, - {0x0000b140 ,0x003f0020 }, - {0x0000b144 ,0x00400041 }, - {0x0000b148 ,0x0140005f }, - {0x0000b14c ,0x0160015f }, - {0x0000b150 ,0x017e017f }, - {0x0000b154 ,0x02410242 }, - {0x0000b158 ,0x025f0240 }, - {0x0000b15c ,0x027f0260 }, - {0x0000b160 ,0x0341027e }, - {0x0000b164 ,0x035f0340 }, - {0x0000b168 ,0x037f0360 }, - {0x0000b16c ,0x04400441 }, - {0x0000b170 ,0x0460045f }, - {0x0000b174 ,0x0541047f }, - {0x0000b178 ,0x055f0540 }, - {0x0000b17c ,0x057f0560 }, - {0x0000b180 ,0x06400641 }, - {0x0000b184 ,0x0660065f }, - {0x0000b188 ,0x067e067f }, - {0x0000b18c ,0x07410742 }, - {0x0000b190 ,0x075f0740 }, - {0x0000b194 ,0x077f0760 }, - {0x0000b198 ,0x07800781 }, - {0x0000b19c ,0x07a0079f }, - {0x0000b1a0 ,0x07c107bf }, - {0x0000b1a4 ,0x000007c0 }, - {0x0000b1a8 ,0x00000000 }, - {0x0000b1ac ,0x00000000 }, - {0x0000b1b0 ,0x00000000 }, - {0x0000b1b4 ,0x00000000 }, - {0x0000b1b8 ,0x00000000 }, - {0x0000b1bc ,0x00000000 }, - {0x0000b1c0 ,0x00000000 }, - {0x0000b1c4 ,0x00000000 }, - {0x0000b1c8 ,0x00000000 }, - {0x0000b1cc ,0x00000000 }, - {0x0000b1d0 ,0x00000000 }, - {0x0000b1d4 ,0x00000000 }, - {0x0000b1d8 ,0x00000000 }, - {0x0000b1dc ,0x00000000 }, - {0x0000b1e0 ,0x00000000 }, - {0x0000b1e4 ,0x00000000 }, - {0x0000b1e8 ,0x00000000 }, - {0x0000b1ec ,0x00000000 }, - {0x0000b1f0 ,0x00000396 }, - {0x0000b1f4 ,0x00000396 }, - {0x0000b1f8 ,0x00000396 }, - {0x0000b1fc ,0x00000196 }, -}; - -static const u32 ar9462_2p0_baseband_core_txfir_coeff_japan_2484[][2 ] = { -/* Addr allmodes */ - {0x0000a398 ,0x00000000 }, - {0x0000a39c ,0x6f7f0301 }, - {0x0000a3a0 ,0xca9228ee }, -}; - -static const u32 ar9462_2p0_modes_low_ob_db_tx_gain[][5 ] = { -/* Addr 5G_HT20 5G_HT40 2G_HT40 2G_HT20 */ - {0x000098bc ,0x00000002 ,0x00000002 ,0x00000002 ,0x00000002 }, - {0x0000a2dc ,0x0380c7fc ,0x0380c7fc ,0x03aaa352 ,0x03aaa352 }, - {0x0000a2e0 ,0x0000f800 ,0x0000f800 ,0x03ccc584 ,0x03ccc584 }, - {0x0000a2e4 ,0x03ff0000 ,0x03ff0000 ,0x03f0f800 ,0x03f0f800 }, - {0x0000a2e8 ,0x00000000 ,0x00000000 ,0x03ff0000 ,0x03ff0000 }, - {0x0000a410 ,0x000050d9 ,0x000050d9 ,0x000050d9 ,0x000050d9 }, - {0x0000a458 ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, - {0x0000a500 ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, - {0x0000a504 ,0x06000003 ,0x06000003 ,0x04000002 ,0x04000002 }, - {0x0000a508 ,0x0a000020 ,0x0a000020 ,0x08000004 ,0x08000004 }, - {0x0000a50c ,0x10000023 ,0x10000023 ,0x0b000200 ,0x0b000200 }, - {0x0000a510 ,0x16000220 ,0x16000220 ,0x0f000202 ,0x0f000202 }, - {0x0000a514 ,0x1c000223 ,0x1c000223 ,0x12000400 ,0x12000400 }, - {0x0000a518 ,0x21020220 ,0x21020220 ,0x16000402 ,0x16000402 }, - {0x0000a51c ,0x27020223 ,0x27020223 ,0x19000404 ,0x19000404 }, - {0x0000a520 ,0x2b022220 ,0x2b022220 ,0x1c000603 ,0x1c000603 }, - {0x0000a524 ,0x2f022222 ,0x2f022222 ,0x21000a02 ,0x21000a02 }, - {0x0000a528 ,0x34022225 ,0x34022225 ,0x25000a04 ,0x25000a04 }, - {0x0000a52c ,0x3a02222a ,0x3a02222a ,0x28000a20 ,0x28000a20 }, - {0x0000a530 ,0x3e02222c ,0x3e02222c ,0x2c000e20 ,0x2c000e20 }, - {0x0000a534 ,0x4202242a ,0x4202242a ,0x30000e22 ,0x30000e22 }, - {0x0000a538 ,0x4702244a ,0x4702244a ,0x34000e24 ,0x34000e24 }, - {0x0000a53c ,0x4b02244c ,0x4b02244c ,0x38001640 ,0x38001640 }, - {0x0000a540 ,0x4e02246c ,0x4e02246c ,0x3c001660 ,0x3c001660 }, - {0x0000a544 ,0x5302266c ,0x5302266c ,0x3f001861 ,0x3f001861 }, - {0x0000a548 ,0x5702286c ,0x5702286c ,0x43001a81 ,0x43001a81 }, - {0x0000a54c ,0x5c04286b ,0x5c04286b ,0x47001a83 ,0x47001a83 }, - {0x0000a550 ,0x61042a6c ,0x61042a6c ,0x4a001c84 ,0x4a001c84 }, - {0x0000a554 ,0x66062a6c ,0x66062a6c ,0x4e001ce3 ,0x4e001ce3 }, - {0x0000a558 ,0x6b062e6c ,0x6b062e6c ,0x52001ce5 ,0x52001ce5 }, - {0x0000a55c ,0x7006308c ,0x7006308c ,0x56001ce9 ,0x56001ce9 }, - {0x0000a560 ,0x730a308a ,0x730a308a ,0x5a001ceb ,0x5a001ceb }, - {0x0000a564 ,0x770a308c ,0x770a308c ,0x5d001eec ,0x5d001eec }, - {0x0000a568 ,0x770a308c ,0x770a308c ,0x5d001eec ,0x5d001eec }, - {0x0000a56c ,0x770a308c ,0x770a308c ,0x5d001eec ,0x5d001eec }, - {0x0000a570 ,0x770a308c ,0x770a308c ,0x5d001eec ,0x5d001eec }, - {0x0000a574 ,0x770a308c ,0x770a308c ,0x5d001eec ,0x5d001eec }, - {0x0000a578 ,0x770a308c ,0x770a308c ,0x5d001eec ,0x5d001eec }, - {0x0000a57c ,0x770a308c ,0x770a308c ,0x5d001eec ,0x5d001eec }, - {0x0000a600 ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, - {0x0000a604 ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, - {0x0000a608 ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, - {0x0000a60c ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, - {0x0000a610 ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, - {0x0000a614 ,0x01404000 ,0x01404000 ,0x01404000 ,0x01404000 }, - {0x0000a618 ,0x01404501 ,0x01404501 ,0x01404501 ,0x01404501 }, - {0x0000a61c ,0x02008802 ,0x02008802 ,0x02008501 ,0x02008501 }, - {0x0000a620 ,0x0300cc03 ,0x0300cc03 ,0x0280ca03 ,0x0280ca03 }, - {0x0000a624 ,0x0300cc03 ,0x0300cc03 ,0x03010c04 ,0x03010c04 }, - {0x0000a628 ,0x0300cc03 ,0x0300cc03 ,0x04014c04 ,0x04014c04 }, - {0x0000a62c ,0x03810c03 ,0x03810c03 ,0x04015005 ,0x04015005 }, - {0x0000a630 ,0x03810e04 ,0x03810e04 ,0x04015005 ,0x04015005 }, - {0x0000a634 ,0x03810e04 ,0x03810e04 ,0x04015005 ,0x04015005 }, - {0x0000a638 ,0x03810e04 ,0x03810e04 ,0x04015005 ,0x04015005 }, - {0x0000a63c ,0x03810e04 ,0x03810e04 ,0x04015005 ,0x04015005 }, - {0x0000b2dc ,0x0380c7fc ,0x0380c7fc ,0x03aaa352 ,0x03aaa352 }, - {0x0000b2e0 ,0x0000f800 ,0x0000f800 ,0x03ccc584 ,0x03ccc584 }, - {0x0000b2e4 ,0x03ff0000 ,0x03ff0000 ,0x03f0f800 ,0x03f0f800 }, - {0x0000b2e8 ,0x00000000 ,0x00000000 ,0x03ff0000 ,0x03ff0000 }, - {0x00016044 ,0x012482d4 ,0x012482d4 ,0x012482d4 ,0x012482d4 }, - {0x00016048 ,0x64992060 ,0x64992060 ,0x64992060 ,0x64992060 }, - {0x00016054 ,0x6db60000 ,0x6db60000 ,0x6db60000 ,0x6db60000 }, - {0x00016444 ,0x012482d4 ,0x012482d4 ,0x012482d4 ,0x012482d4 }, - {0x00016448 ,0x64992000 ,0x64992000 ,0x64992000 ,0x64992000 }, - {0x00016454 ,0x6db60000 ,0x6db60000 ,0x6db60000 ,0x6db60000 }, -}; - -static const u32 ar9462_2p0_soc_postamble[][5 ] = { -/* Addr 5G_HT20 5G_HT40 2G_HT40 2G_HT20 */ - {0x00007010 ,0x00000033 ,0x00000033 ,0x00000033 ,0x00000033 }, -}; - -static const u32 ar9462_2p0_baseband_core[][2 ] = { +static const u32 ar9462_2p0_modes_low_ob_db_tx_gain[][5 ] = { +/* Addr 5G_HT20 5G_HT40 2G_HT40 2G_HT20 */ + {0x000098bc ,0x00000002 ,0x00000002 ,0x00000002 ,0x00000002 }, + {0x0000a2dc ,0x0380c7fc ,0x0380c7fc ,0x03aaa352 ,0x03aaa352 }, + {0x0000a2e0 ,0x0000f800 ,0x0000f800 ,0x03ccc584 ,0x03ccc584 }, + {0x0000a2e4 ,0x03ff0000 ,0x03ff0000 ,0x03f0f800 ,0x03f0f800 }, + {0x0000a2e8 ,0x00000000 ,0x00000000 ,0x03ff0000 ,0x03ff0000 }, + {0x0000a410 ,0x000050d9 ,0x000050d9 ,0x000050d9 ,0x000050d9 }, + {0x0000a458 ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, + {0x0000a500 ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, + {0x0000a504 ,0x06000003 ,0x06000003 ,0x04000002 ,0x04000002 }, + {0x0000a508 ,0x0a000020 ,0x0a000020 ,0x08000004 ,0x08000004 }, + {0x0000a50c ,0x10000023 ,0x10000023 ,0x0b000200 ,0x0b000200 }, + {0x0000a510 ,0x16000220 ,0x16000220 ,0x0f000202 ,0x0f000202 }, + {0x0000a514 ,0x1c000223 ,0x1c000223 ,0x12000400 ,0x12000400 }, + {0x0000a518 ,0x21020220 ,0x21020220 ,0x16000402 ,0x16000402 }, + {0x0000a51c ,0x27020223 ,0x27020223 ,0x19000404 ,0x19000404 }, + {0x0000a520 ,0x2b022220 ,0x2b022220 ,0x1c000603 ,0x1c000603 }, + {0x0000a524 ,0x2f022222 ,0x2f022222 ,0x21000a02 ,0x21000a02 }, + {0x0000a528 ,0x34022225 ,0x34022225 ,0x25000a04 ,0x25000a04 }, + {0x0000a52c ,0x3a02222a ,0x3a02222a ,0x28000a20 ,0x28000a20 }, + {0x0000a530 ,0x3e02222c ,0x3e02222c ,0x2c000e20 ,0x2c000e20 }, + {0x0000a534 ,0x4202242a ,0x4202242a ,0x30000e22 ,0x30000e22 }, + {0x0000a538 ,0x4702244a ,0x4702244a ,0x34000e24 ,0x34000e24 }, + {0x0000a53c ,0x4b02244c ,0x4b02244c ,0x38001640 ,0x38001640 }, + {0x0000a540 ,0x4e02246c ,0x4e02246c ,0x3c001660 ,0x3c001660 }, + {0x0000a544 ,0x5302266c ,0x5302266c ,0x3f001861 ,0x3f001861 }, + {0x0000a548 ,0x5702286c ,0x5702286c ,0x43001a81 ,0x43001a81 }, + {0x0000a54c ,0x5c04286b ,0x5c04286b ,0x47001a83 ,0x47001a83 }, + {0x0000a550 ,0x61042a6c ,0x61042a6c ,0x4a001c84 ,0x4a001c84 }, + {0x0000a554 ,0x66062a6c ,0x66062a6c ,0x4e001ce3 ,0x4e001ce3 }, + {0x0000a558 ,0x6b062e6c ,0x6b062e6c ,0x52001ce5 ,0x52001ce5 }, + {0x0000a55c ,0x7006308c ,0x7006308c ,0x56001ce9 ,0x56001ce9 }, + {0x0000a560 ,0x730a308a ,0x730a308a ,0x5a001ceb ,0x5a001ceb }, + {0x0000a564 ,0x770a308c ,0x770a308c ,0x5d001eec ,0x5d001eec }, + {0x0000a568 ,0x770a308c ,0x770a308c ,0x5d001eec ,0x5d001eec }, + {0x0000a56c ,0x770a308c ,0x770a308c ,0x5d001eec ,0x5d001eec }, + {0x0000a570 ,0x770a308c ,0x770a308c ,0x5d001eec ,0x5d001eec }, + {0x0000a574 ,0x770a308c ,0x770a308c ,0x5d001eec ,0x5d001eec }, + {0x0000a578 ,0x770a308c ,0x770a308c ,0x5d001eec ,0x5d001eec }, + {0x0000a57c ,0x770a308c ,0x770a308c ,0x5d001eec ,0x5d001eec }, + {0x0000a600 ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, + {0x0000a604 ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, + {0x0000a608 ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, + {0x0000a60c ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, + {0x0000a610 ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, + {0x0000a614 ,0x01404000 ,0x01404000 ,0x01404000 ,0x01404000 }, + {0x0000a618 ,0x01404501 ,0x01404501 ,0x01404501 ,0x01404501 }, + {0x0000a61c ,0x02008802 ,0x02008802 ,0x02008501 ,0x02008501 }, + {0x0000a620 ,0x0300cc03 ,0x0300cc03 ,0x0280ca03 ,0x0280ca03 }, + {0x0000a624 ,0x0300cc03 ,0x0300cc03 ,0x03010c04 ,0x03010c04 }, + {0x0000a628 ,0x0300cc03 ,0x0300cc03 ,0x04014c04 ,0x04014c04 }, + {0x0000a62c ,0x03810c03 ,0x03810c03 ,0x04015005 ,0x04015005 }, + {0x0000a630 ,0x03810e04 ,0x03810e04 ,0x04015005 ,0x04015005 }, + {0x0000a634 ,0x03810e04 ,0x03810e04 ,0x04015005 ,0x04015005 }, + {0x0000a638 ,0x03810e04 ,0x03810e04 ,0x04015005 ,0x04015005 }, + {0x0000a63c ,0x03810e04 ,0x03810e04 ,0x04015005 ,0x04015005 }, + {0x0000b2dc ,0x0380c7fc ,0x0380c7fc ,0x03aaa352 ,0x03aaa352 }, + {0x0000b2e0 ,0x0000f800 ,0x0000f800 ,0x03ccc584 ,0x03ccc584 }, + {0x0000b2e4 ,0x03ff0000 ,0x03ff0000 ,0x03f0f800 ,0x03f0f800 }, + {0x0000b2e8 ,0x00000000 ,0x00000000 ,0x03ff0000 ,0x03ff0000 }, + {0x00016044 ,0x012482d4 ,0x012482d4 ,0x012482d4 ,0x012482d4 }, + {0x00016048 ,0x64992060 ,0x64992060 ,0x64992060 ,0x64992060 }, + {0x00016054 ,0x6db60000 ,0x6db60000 ,0x6db60000 ,0x6db60000 }, + {0x00016444 ,0x012482d4 ,0x012482d4 ,0x012482d4 ,0x012482d4 }, + {0x00016448 ,0x64992000 ,0x64992000 ,0x64992000 ,0x64992000 }, + {0x00016454 ,0x6db60000 ,0x6db60000 ,0x6db60000 ,0x6db60000 }, +}; + +static const u32 ar9462_2p0_soc_postamble[][5 ] = { +/* Addr 5G_HT20 5G_HT40 2G_HT40 2G_HT20 */ + {0x00007010 ,0x00000033 ,0x00000033 ,0x00000033 ,0x00000033 }, +}; + +static const u32 ar9462_2p0_baseband_core[][2 ] = {/* Addr allmodes */ {0x00009800 ,0xafe68e30 }, {0x00009804, 0xfd14e000},
@@ -1226,18 +967,6 @@ static const u32 ar9462_2p0_mac_core[][2] = { {0x000083d0, 0x000301ff}, }; -static const u32 ar9462_2p0_mac_postamble[][5 ] = { -/* Addr 5G_HT20 5G_HT40 2G_HT40 2G_HT20 */ - {0x00001030 ,0x00000230 ,0x00000460 ,0x000002c0 ,0x00000160 }, - {0x00001070 ,0x00000168 ,0x000002d0 ,0x00000318 ,0x0000018c }, - {0x000010b0 ,0x00000e60 ,0x00001cc0 ,0x00007c70 ,0x00003e38 }, - {0x00008014 ,0x03e803e8 ,0x07d007d0 ,0x10801600 ,0x08400b00 }, - {0x0000801c ,0x128d8027 ,0x128d804f ,0x12e00057 ,0x12e0002b }, - {0x00008120 ,0x08f04800 ,0x08f04800 ,0x08f04810 ,0x08f04810 }, - {0x000081d0 ,0x00003210 ,0x00003210 ,0x0000320a ,0x0000320a }, - {0x00008318 ,0x00003e80 ,0x00007d00 ,0x00006880 ,0x00003440 }, -}; -static const u32 ar9462_2p0_common_mixed_rx_gain[][2 ] = {/* Addr allmodes */ {0x0000a000, 0x00010000},
@@ -1503,266 +1232,6 @@ static const u32 ar9462_2p0_baseband_postamble_5g_xlna[][5] = { {0x00009e3c, 0xcf946220, 0xcf946220, 0xcfd5c782, 0xcfd5c282}, }; -static const u32 ar9462_2p0_common_5g_xlna_only_rxgain[][2 ] = { -/* Addr allmodes */ - {0x0000a000 ,0x00010000 }, - {0x0000a004 ,0x00030002 }, - {0x0000a008 ,0x00050004 }, - {0x0000a00c ,0x00810080 }, - {0x0000a010 ,0x00830082 }, - {0x0000a014 ,0x01810180 }, - {0x0000a018 ,0x01830182 }, - {0x0000a01c ,0x01850184 }, - {0x0000a020 ,0x01890188 }, - {0x0000a024 ,0x018b018a }, - {0x0000a028 ,0x018d018c }, - {0x0000a02c ,0x03820190 }, - {0x0000a030 ,0x03840383 }, - {0x0000a034 ,0x03880385 }, - {0x0000a038 ,0x038a0389 }, - {0x0000a03c ,0x038c038b }, - {0x0000a040 ,0x0390038d }, - {0x0000a044 ,0x03920391 }, - {0x0000a048 ,0x03940393 }, - {0x0000a04c ,0x03960395 }, - {0x0000a050 ,0x00000000 }, - {0x0000a054 ,0x00000000 }, - {0x0000a058 ,0x00000000 }, - {0x0000a05c ,0x00000000 }, - {0x0000a060 ,0x00000000 }, - {0x0000a064 ,0x00000000 }, - {0x0000a068 ,0x00000000 }, - {0x0000a06c ,0x00000000 }, - {0x0000a070 ,0x00000000 }, - {0x0000a074 ,0x00000000 }, - {0x0000a078 ,0x00000000 }, - {0x0000a07c ,0x00000000 }, - {0x0000a080 ,0x29292929 }, - {0x0000a084 ,0x29292929 }, - {0x0000a088 ,0x29292929 }, - {0x0000a08c ,0x29292929 }, - {0x0000a090 ,0x22292929 }, - {0x0000a094 ,0x1d1d2222 }, - {0x0000a098 ,0x0c111117 }, - {0x0000a09c ,0x00030303 }, - {0x0000a0a0 ,0x00000000 }, - {0x0000a0a4 ,0x00000000 }, - {0x0000a0a8 ,0x00000000 }, - {0x0000a0ac ,0x00000000 }, - {0x0000a0b0 ,0x00000000 }, - {0x0000a0b4 ,0x00000000 }, - {0x0000a0b8 ,0x00000000 }, - {0x0000a0bc ,0x00000000 }, - {0x0000a0c0 ,0x001f0000 }, - {0x0000a0c4 ,0x01000101 }, - {0x0000a0c8 ,0x011e011f }, - {0x0000a0cc ,0x011c011d }, - {0x0000a0d0 ,0x02030204 }, - {0x0000a0d4 ,0x02010202 }, - {0x0000a0d8 ,0x021f0200 }, - {0x0000a0dc ,0x0302021e }, - {0x0000a0e0 ,0x03000301 }, - {0x0000a0e4 ,0x031e031f }, - {0x0000a0e8 ,0x0402031d }, - {0x0000a0ec ,0x04000401 }, - {0x0000a0f0 ,0x041e041f }, - {0x0000a0f4 ,0x0502041d }, - {0x0000a0f8 ,0x05000501 }, - {0x0000a0fc ,0x051e051f }, - {0x0000a100 ,0x06010602 }, - {0x0000a104 ,0x061f0600 }, - {0x0000a108 ,0x061d061e }, - {0x0000a10c ,0x07020703 }, - {0x0000a110 ,0x07000701 }, - {0x0000a114 ,0x00000000 }, - {0x0000a118 ,0x00000000 }, - {0x0000a11c ,0x00000000 }, - {0x0000a120 ,0x00000000 }, - {0x0000a124 ,0x00000000 }, - {0x0000a128 ,0x00000000 }, - {0x0000a12c ,0x00000000 }, - {0x0000a130 ,0x00000000 }, - {0x0000a134 ,0x00000000 }, - {0x0000a138 ,0x00000000 }, - {0x0000a13c ,0x00000000 }, - {0x0000a140 ,0x001f0000 }, - {0x0000a144 ,0x01000101 }, - {0x0000a148 ,0x011e011f }, - {0x0000a14c ,0x011c011d }, - {0x0000a150 ,0x02030204 }, - {0x0000a154 ,0x02010202 }, - {0x0000a158 ,0x021f0200 }, - {0x0000a15c ,0x0302021e }, - {0x0000a160 ,0x03000301 }, - {0x0000a164 ,0x031e031f }, - {0x0000a168 ,0x0402031d }, - {0x0000a16c ,0x04000401 }, - {0x0000a170 ,0x041e041f }, - {0x0000a174 ,0x0502041d }, - {0x0000a178 ,0x05000501 }, - {0x0000a17c ,0x051e051f }, - {0x0000a180 ,0x06010602 }, - {0x0000a184 ,0x061f0600 }, - {0x0000a188 ,0x061d061e }, - {0x0000a18c ,0x07020703 }, - {0x0000a190 ,0x07000701 }, - {0x0000a194 ,0x00000000 }, - {0x0000a198 ,0x00000000 }, - {0x0000a19c ,0x00000000 }, - {0x0000a1a0 ,0x00000000 }, - {0x0000a1a4 ,0x00000000 }, - {0x0000a1a8 ,0x00000000 }, - {0x0000a1ac ,0x00000000 }, - {0x0000a1b0 ,0x00000000 }, - {0x0000a1b4 ,0x00000000 }, - {0x0000a1b8 ,0x00000000 }, - {0x0000a1bc ,0x00000000 }, - {0x0000a1c0 ,0x00000000 }, - {0x0000a1c4 ,0x00000000 }, - {0x0000a1c8 ,0x00000000 }, - {0x0000a1cc ,0x00000000 }, - {0x0000a1d0 ,0x00000000 }, - {0x0000a1d4 ,0x00000000 }, - {0x0000a1d8 ,0x00000000 }, - {0x0000a1dc ,0x00000000 }, - {0x0000a1e0 ,0x00000000 }, - {0x0000a1e4 ,0x00000000 }, - {0x0000a1e8 ,0x00000000 }, - {0x0000a1ec ,0x00000000 }, - {0x0000a1f0 ,0x00000396 }, - {0x0000a1f4 ,0x00000396 }, - {0x0000a1f8 ,0x00000396 }, - {0x0000a1fc ,0x00000196 }, - {0x0000b000 ,0x00010000 }, - {0x0000b004 ,0x00030002 }, - {0x0000b008 ,0x00050004 }, - {0x0000b00c ,0x00810080 }, - {0x0000b010 ,0x00830082 }, - {0x0000b014 ,0x01810180 }, - {0x0000b018 ,0x01830182 }, - {0x0000b01c ,0x01850184 }, - {0x0000b020 ,0x02810280 }, - {0x0000b024 ,0x02830282 }, - {0x0000b028 ,0x02850284 }, - {0x0000b02c ,0x02890288 }, - {0x0000b030 ,0x028b028a }, - {0x0000b034 ,0x0388028c }, - {0x0000b038 ,0x038a0389 }, - {0x0000b03c ,0x038c038b }, - {0x0000b040 ,0x0390038d }, - {0x0000b044 ,0x03920391 }, - {0x0000b048 ,0x03940393 }, - {0x0000b04c ,0x03960395 }, - {0x0000b050 ,0x00000000 }, - {0x0000b054 ,0x00000000 }, - {0x0000b058 ,0x00000000 }, - {0x0000b05c ,0x00000000 }, - {0x0000b060 ,0x00000000 }, - {0x0000b064 ,0x00000000 }, - {0x0000b068 ,0x00000000 }, - {0x0000b06c ,0x00000000 }, - {0x0000b070 ,0x00000000 }, - {0x0000b074 ,0x00000000 }, - {0x0000b078 ,0x00000000 }, - {0x0000b07c ,0x00000000 }, - {0x0000b080 ,0x2a2d2f32 }, - {0x0000b084 ,0x21232328 }, - {0x0000b088 ,0x19191c1e }, - {0x0000b08c ,0x12141417 }, - {0x0000b090 ,0x07070e0e }, - {0x0000b094 ,0x03030305 }, - {0x0000b098 ,0x00000003 }, - {0x0000b09c ,0x00000000 }, - {0x0000b0a0 ,0x00000000 }, - {0x0000b0a4 ,0x00000000 }, - {0x0000b0a8 ,0x00000000 }, - {0x0000b0ac ,0x00000000 }, - {0x0000b0b0 ,0x00000000 }, - {0x0000b0b4 ,0x00000000 }, - {0x0000b0b8 ,0x00000000 }, - {0x0000b0bc ,0x00000000 }, - {0x0000b0c0 ,0x003f0020 }, - {0x0000b0c4 ,0x00400041 }, - {0x0000b0c8 ,0x0140005f }, - {0x0000b0cc ,0x0160015f }, - {0x0000b0d0 ,0x017e017f }, - {0x0000b0d4 ,0x02410242 }, - {0x0000b0d8 ,0x025f0240 }, - {0x0000b0dc ,0x027f0260 }, - {0x0000b0e0 ,0x0341027e }, - {0x0000b0e4 ,0x035f0340 }, - {0x0000b0e8 ,0x037f0360 }, - {0x0000b0ec ,0x04400441 }, - {0x0000b0f0 ,0x0460045f }, - {0x0000b0f4 ,0x0541047f }, - {0x0000b0f8 ,0x055f0540 }, - {0x0000b0fc ,0x057f0560 }, - {0x0000b100 ,0x06400641 }, - {0x0000b104 ,0x0660065f }, - {0x0000b108 ,0x067e067f }, - {0x0000b10c ,0x07410742 }, - {0x0000b110 ,0x075f0740 }, - {0x0000b114 ,0x077f0760 }, - {0x0000b118 ,0x07800781 }, - {0x0000b11c ,0x07a0079f }, - {0x0000b120 ,0x07c107bf }, - {0x0000b124 ,0x000007c0 }, - {0x0000b128 ,0x00000000 }, - {0x0000b12c ,0x00000000 }, - {0x0000b130 ,0x00000000 }, - {0x0000b134 ,0x00000000 }, - {0x0000b138 ,0x00000000 }, - {0x0000b13c ,0x00000000 }, - {0x0000b140 ,0x003f0020 }, - {0x0000b144 ,0x00400041 }, - {0x0000b148 ,0x0140005f }, - {0x0000b14c ,0x0160015f }, - {0x0000b150 ,0x017e017f }, - {0x0000b154 ,0x02410242 }, - {0x0000b158 ,0x025f0240 }, - {0x0000b15c ,0x027f0260 }, - {0x0000b160 ,0x0341027e }, - {0x0000b164 ,0x035f0340 }, - {0x0000b168 ,0x037f0360 }, - {0x0000b16c ,0x04400441 }, - {0x0000b170 ,0x0460045f }, - {0x0000b174 ,0x0541047f }, - {0x0000b178 ,0x055f0540 }, - {0x0000b17c ,0x057f0560 }, - {0x0000b180 ,0x06400641 }, - {0x0000b184 ,0x0660065f }, - {0x0000b188 ,0x067e067f }, - {0x0000b18c ,0x07410742 }, - {0x0000b190 ,0x075f0740 }, - {0x0000b194 ,0x077f0760 }, - {0x0000b198 ,0x07800781 }, - {0x0000b19c ,0x07a0079f }, - {0x0000b1a0 ,0x07c107bf }, - {0x0000b1a4 ,0x000007c0 }, - {0x0000b1a8 ,0x00000000 }, - {0x0000b1ac ,0x00000000 }, - {0x0000b1b0 ,0x00000000 }, - {0x0000b1b4 ,0x00000000 }, - {0x0000b1b8 ,0x00000000 }, - {0x0000b1bc ,0x00000000 }, - {0x0000b1c0 ,0x00000000 }, - {0x0000b1c4 ,0x00000000 }, - {0x0000b1c8 ,0x00000000 }, - {0x0000b1cc ,0x00000000 }, - {0x0000b1d0 ,0x00000000 }, - {0x0000b1d4 ,0x00000000 }, - {0x0000b1d8 ,0x00000000 }, - {0x0000b1dc ,0x00000000 }, - {0x0000b1e0 ,0x00000000 }, - {0x0000b1e4 ,0x00000000 }, - {0x0000b1e8 ,0x00000000 }, - {0x0000b1ec ,0x00000000 }, - {0x0000b1f0 ,0x00000396 }, - {0x0000b1f4 ,0x00000396 }, - {0x0000b1f8 ,0x00000396 }, - {0x0000b1fc ,0x00000196 }, -}; -static const u32 ar9462_2p0_baseband_core_mix_rxgain[][2 ] = {/* Addr allmodes */ {0x00009fd0, 0x0a2d6b93},
Signature · 1 line
1.8.4.2
PATCH 11/16 ath9k: Identify duplicate AR9565 v1.0 initvals
In reply to Sujith ManoharanFrom: Sujith Manoharan <[email protected]>
--- .../net/wireless/ath/ath9k/ar9565_1p0_initvals.h | 85 ++-------------------- 1 file changed, 6 insertions(+), 79 deletions(-)
drivers/net/wireless/ath/ath9k/ar9565_1p0_initvals.h +6 -79
@@ -20,6 +20,12 @@/* AR9565 1.0 */ +#define ar9565_1p0_mac_postamble ar9331_1p1_mac_postamble + +#define ar9565_1p0_Modes_lowest_ob_db_tx_gain_table ar9565_1p0_modes_low_ob_db_tx_gain_table + +#define ar9565_1p0_baseband_core_txfir_coeff_japan_2484 ar9300_2p2_baseband_core_txfir_coeff_japan_2484 +static const u32 ar9565_1p0_mac_core[][2 ] = {/* Addr allmodes */ {0x00000008 ,0x00000000 },
@@ -182,18 +188,6 @@ static const u32 ar9565_1p0_mac_core[][2] = { {0x000083d0, 0x800301ff}, }; -static const u32 ar9565_1p0_mac_postamble[][5 ] = { -/* Addr 5G_HT20 5G_HT40 2G_HT40 2G_HT20 */ - {0x00001030 ,0x00000230 ,0x00000460 ,0x000002c0 ,0x00000160 }, - {0x00001070 ,0x00000168 ,0x000002d0 ,0x00000318 ,0x0000018c }, - {0x000010b0 ,0x00000e60 ,0x00001cc0 ,0x00007c70 ,0x00003e38 }, - {0x00008014 ,0x03e803e8 ,0x07d007d0 ,0x10801600 ,0x08400b00 }, - {0x0000801c ,0x128d8027 ,0x128d804f ,0x12e00057 ,0x12e0002b }, - {0x00008120 ,0x08f04800 ,0x08f04800 ,0x08f04810 ,0x08f04810 }, - {0x000081d0 ,0x00003210 ,0x00003210 ,0x0000320a ,0x0000320a }, - {0x00008318 ,0x00003e80 ,0x00007d00 ,0x00006880 ,0x00003440 }, -}; -static const u32 ar9565_1p0_baseband_core[][2 ] = {/* Addr allmodes */ {0x00009800, 0xafe68e30},
@@ -711,66 +705,6 @@ static const u32 ar9565_1p0_Common_rx_gain_table[][2] = { {0x0000b1fc, 0x00000196}, }; -static const u32 ar9565_1p0_Modes_lowest_ob_db_tx_gain_table[][5 ] = { -/* Addr 5G_HT20 5G_HT40 2G_HT40 2G_HT20 */ - {0x0000a2dc ,0xfc0a9380 ,0xfc0a9380 ,0xfdab5b52 ,0xfdab5b52 }, - {0x0000a2e0 ,0xffecec00 ,0xffecec00 ,0xfd339c84 ,0xfd339c84 }, - {0x0000a2e4 ,0xfc0f0000 ,0xfc0f0000 ,0xfec3e000 ,0xfec3e000 }, - {0x0000a2e8 ,0xfc100000 ,0xfc100000 ,0xfffc0000 ,0xfffc0000 }, - {0x0000a410 ,0x000050d9 ,0x000050d9 ,0x000050d9 ,0x000050d9 }, - {0x0000a500 ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, - {0x0000a504 ,0x06000003 ,0x06000003 ,0x04000002 ,0x04000002 }, - {0x0000a508 ,0x0a000020 ,0x0a000020 ,0x08000004 ,0x08000004 }, - {0x0000a50c ,0x10000023 ,0x10000023 ,0x0b000200 ,0x0b000200 }, - {0x0000a510 ,0x16000220 ,0x16000220 ,0x0f000202 ,0x0f000202 }, - {0x0000a514 ,0x1c000223 ,0x1c000223 ,0x12000400 ,0x12000400 }, - {0x0000a518 ,0x21020220 ,0x21020220 ,0x16000402 ,0x16000402 }, - {0x0000a51c ,0x27020223 ,0x27020223 ,0x19000404 ,0x19000404 }, - {0x0000a520 ,0x2b022220 ,0x2b022220 ,0x1c000603 ,0x1c000603 }, - {0x0000a524 ,0x2f022222 ,0x2f022222 ,0x21000a02 ,0x21000a02 }, - {0x0000a528 ,0x34022225 ,0x34022225 ,0x25000a04 ,0x25000a04 }, - {0x0000a52c ,0x3a02222a ,0x3a02222a ,0x28000a20 ,0x28000a20 }, - {0x0000a530 ,0x3e02222c ,0x3e02222c ,0x2c000e20 ,0x2c000e20 }, - {0x0000a534 ,0x4202242a ,0x4202242a ,0x30000e22 ,0x30000e22 }, - {0x0000a538 ,0x4702244a ,0x4702244a ,0x34000e24 ,0x34000e24 }, - {0x0000a53c ,0x4b02244c ,0x4b02244c ,0x38001640 ,0x38001640 }, - {0x0000a540 ,0x4e02246c ,0x4e02246c ,0x3c001660 ,0x3c001660 }, - {0x0000a544 ,0x5302266c ,0x5302266c ,0x3f001861 ,0x3f001861 }, - {0x0000a548 ,0x5702286c ,0x5702286c ,0x43001a81 ,0x43001a81 }, - {0x0000a54c ,0x5c04286b ,0x5c04286b ,0x47001a83 ,0x47001a83 }, - {0x0000a550 ,0x61042a6c ,0x61042a6c ,0x4a001c84 ,0x4a001c84 }, - {0x0000a554 ,0x66062a6c ,0x66062a6c ,0x4e001ce3 ,0x4e001ce3 }, - {0x0000a558 ,0x6b062e6c ,0x6b062e6c ,0x52001ce5 ,0x52001ce5 }, - {0x0000a55c ,0x7006308c ,0x7006308c ,0x56001ce9 ,0x56001ce9 }, - {0x0000a560 ,0x730a308a ,0x730a308a ,0x5a001ceb ,0x5a001ceb }, - {0x0000a564 ,0x770a308c ,0x770a308c ,0x5d001eec ,0x5d001eec }, - {0x0000a568 ,0x770a308c ,0x770a308c ,0x5d001eec ,0x5d001eec }, - {0x0000a56c ,0x770a308c ,0x770a308c ,0x5d001eec ,0x5d001eec }, - {0x0000a570 ,0x770a308c ,0x770a308c ,0x5d001eec ,0x5d001eec }, - {0x0000a574 ,0x770a308c ,0x770a308c ,0x5d001eec ,0x5d001eec }, - {0x0000a578 ,0x770a308c ,0x770a308c ,0x5d001eec ,0x5d001eec }, - {0x0000a57c ,0x770a308c ,0x770a308c ,0x5d001eec ,0x5d001eec }, - {0x0000a600 ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, - {0x0000a604 ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, - {0x0000a608 ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, - {0x0000a60c ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, - {0x0000a610 ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, - {0x0000a614 ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, - {0x0000a618 ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, - {0x0000a61c ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, - {0x0000a620 ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, - {0x0000a624 ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, - {0x0000a628 ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, - {0x0000a62c ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, - {0x0000a630 ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, - {0x0000a634 ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, - {0x0000a638 ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, - {0x0000a63c ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, - {0x00016044 ,0x012482d4 ,0x012482d4 ,0x012482d4 ,0x012482d4 }, - {0x00016048 ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, - {0x00016054 ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, -}; -static const u32 ar9565_1p0_pciephy_clkreq_disable_L1[][2 ] = {/* Addr allmodes */ {0x00018c00, 0x18212ede},
@@ -1231,11 +1165,4 @@ static const u32 ar9565_1p0_modes_high_power_tx_gain_table[][5] = { {0x00016054, 0x00000000, 0x00000000, 0x00000000, 0x00000000}, }; -static const u32 ar9565_1p0_baseband_core_txfir_coeff_japan_2484[][2] = { - /* Addr allmodes */ - {0x0000a398, 0x00000000}, - {0x0000a39c, 0x6f7f0301}, - {0x0000a3a0, 0xca9228ee}, -}; - #endif /* INITVALS_9565_1P0_H */
Signature · 1 line
1.8.4.2
PATCH 12/16 ath9k: Fix regulatory compliance
In reply to Sujith ManoharanFrom: Sujith Manoharan <[email protected]>
Adjusting the CCA registers for maximum permissible noise floor in ETSI/Japan domains has to be done for all AR9003 family chips.
--- drivers/net/wireless/ath/ath9k/ar9003_phy.h | 5 +++-- drivers/net/wireless/ath/ath9k/hw.c | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-)
drivers/net/wireless/ath/ath9k/ar9003_phy.h +3 -2
@@ -341,14 +341,15 @@#define AR_PHY_CCA_MAX_GOOD_VAL_9300_2GHZ -95#define AR_PHY_CCA_MAX_GOOD_VAL_9300_5GHZ -100 +#define AR_PHY_CCA_MAX_GOOD_VAL_9300_FCC_2GHZ -95 +#define AR_PHY_CCA_MAX_GOOD_VAL_9300_FCC_5GHZ -100 +#define AR_PHY_CCA_NOM_VAL_9462_2GHZ -127#define AR_PHY_CCA_MIN_GOOD_VAL_9462_2GHZ -127#define AR_PHY_CCA_MAX_GOOD_VAL_9462_2GHZ -60 -#define AR_PHY_CCA_MAX_GOOD_VAL_9462_FCC_2GHZ -95#define AR_PHY_CCA_NOM_VAL_9462_5GHZ -127#define AR_PHY_CCA_MIN_GOOD_VAL_9462_5GHZ -127#define AR_PHY_CCA_MAX_GOOD_VAL_9462_5GHZ -60 -#define AR_PHY_CCA_MAX_GOOD_VAL_9462_FCC_5GHZ -100#define AR_PHY_CCA_NOM_VAL_9330_2GHZ -118
drivers/net/wireless/ath/ath9k/hw.c +3 -3
@@ -548,11 +548,11 @@ static int ath9k_hw_post_init(struct ath_hw *ah)* EEPROM needs to be initialized before we do this. * This is required for regulatory compliance. */ -if (AR_SREV_9462 (ah) ||AR_SREV_9565 (ah)) { +if (AR_SREV_9300_20_OR_LATER (ah)) {u16 regdmn = ah->eep_ops->get_eeprom (ah,EEP_REG_0 );if ((regdmn &0xF0 ) ==CTL_FCC ) { - ah->nf_2g.max =AR_PHY_CCA_MAX_GOOD_VAL_9462_FCC_2GHZ ; - ah->nf_5g.max =AR_PHY_CCA_MAX_GOOD_VAL_9462_FCC_5GHZ ; + ah->nf_2g.max =AR_PHY_CCA_MAX_GOOD_VAL_9300_FCC_2GHZ ; + ah->nf_5g.max =AR_PHY_CCA_MAX_GOOD_VAL_9300_FCC_5GHZ ; } }
Signature · 1 line
1.8.4.2
PATCH 13/16 ath9k: Remove AR9330 v1.0 macro as it's not supported
In reply to Sujith ManoharanFrom: Sujith Manoharan <[email protected]>
--- drivers/net/wireless/ath/ath9k/reg.h | 3 --- 1 file changed, 3 deletions(-)
drivers/net/wireless/ath/ath9k/reg.h +0 -3
@@ -883,9 +883,6 @@#define AR_SREV_9330 (_ah) \ (((_ah)->hw_version.macVersion == AR_SREV_VERSION_9330)) -#define AR_SREV_9330_10 (_ah) \ - (AR_SREV_9330((_ah)) && \ - ((_ah)->hw_version.macRev == AR_SREV_REVISION_9330_10))#define AR_SREV_9330_11 (_ah) \ (AR_SREV_9330((_ah)) && \ ((_ah)->hw_version.macRev == AR_SREV_REVISION_9330_11))
Signature · 1 line
1.8.4.2
PATCH 14/16 ath9k: Enable manual peak calibration for AR9331 v1.1
In reply to Sujith ManoharanFrom: Sujith Manoharan <[email protected]>
--- drivers/net/wireless/ath/ath9k/ar9003_calib.c | 29 ++++++++++++++++++--------- 1 file changed, 19 insertions(+), 10 deletions(-)
drivers/net/wireless/ath/ath9k/ar9003_calib.c +19 -10
@@ -898,7 +898,7 @@ static void ar9003_hw_tx_iq_cal_reload(struct ath_hw *ah)static void ar9003_hw_manual_peak_cal (struct ath_hw *ah,u8 chain,bool is_2g) { -int offset[8 ], total =0 , test; +int offset[8 ] = {0 }, total =0 , test;int agc_out, i; REG_RMW_FIELD(ah, AR_PHY_65NM_RXRF_GAINSTAGES(chain),
@@ -923,12 +923,18 @@ static void ar9003_hw_manual_peak_cal(struct ath_hw *ah, u8 chain, bool is_2g) AR_PHY_65NM_RXRF_AGC_AGC_ON_OVR, 0x1);REG_RMW_FIELD (ah,AR_PHY_65NM_RXRF_AGC (chain),AR_PHY_65NM_RXRF_AGC_AGC_CAL_OVR ,0x1 ); -if (is_2g) -REG_RMW_FIELD (ah,AR_PHY_65NM_RXRF_AGC (chain), -AR_PHY_65NM_RXRF_AGC_AGC2G_DBDAC_OVR ,0x0 ); -else + +if (AR_SREV_9330_11 (ah)) {REG_RMW_FIELD (ah,AR_PHY_65NM_RXRF_AGC (chain), -AR_PHY_65NM_RXRF_AGC_AGC5G_DBDAC_OVR ,0x0 ); +AR_PHY_65NM_RXRF_AGC_AGC2G_CALDAC_OVR ,0x0 ); + }else { +if (is_2g) +REG_RMW_FIELD (ah,AR_PHY_65NM_RXRF_AGC (chain), +AR_PHY_65NM_RXRF_AGC_AGC2G_DBDAC_OVR ,0x0 ); +else +REG_RMW_FIELD (ah,AR_PHY_65NM_RXRF_AGC (chain), +AR_PHY_65NM_RXRF_AGC_AGC5G_DBDAC_OVR ,0x0 ); + }for (i =6 ; i >0 ; i--) { offset[i] =BIT (i -1 );
@@ -964,9 +970,9 @@ static void ar9003_hw_manual_peak_cal(struct ath_hw *ah, u8 chain, bool is_2g) AR_PHY_65NM_RXRF_AGC_AGC_CAL_OVR, 0); } -static void ar9003_hw_do_manual_peak_cal (struct ath_hw *ah, -struct ath9k_channel *chan, -bool run_rtt_cal) +static void ar9003_hw_do_pcoem_manual_peak_cal (struct ath_hw *ah, +struct ath9k_channel *chan, +bool run_rtt_cal) {struct ath9k_hw_cal_data *caldata = ah->caldata;int i;
@@ -1145,7 +1151,7 @@ skip_tx_iqcal:AR_PHY_AGC_CONTROL_CAL , 0, AH_WAIT_TIMEOUT); -ar9003_hw_do_manual_peak_cal (ah, chan, run_rtt_cal); +ar9003_hw_do_pcoem_manual_peak_cal (ah, chan, run_rtt_cal); }if (REG_READ (ah,AR_PHY_CL_CAL_CTL ) &AR_PHY_CL_CAL_ENABLE ) {
@@ -1267,6 +1273,9 @@ static bool ar9003_hw_init_cal_soc(struct ath_hw *ah, skip_tx_iqcal:if (run_agc_cal || !(ah->ah_flags &AH_FASTCC )) { +if (AR_SREV_9330_11 (ah)) +ar9003_hw_manual_peak_cal (ah,0 ,IS_CHAN_2GHZ (chan)); +/* Calibrate the AGC */ REG_WRITE(ah, AR_PHY_AGC_CONTROL, REG_READ(ah, AR_PHY_AGC_CONTROL) |
Signature · 1 line
1.8.4.2
PATCH 15/16 ath9k: Fix internal regulator for AR955x
In reply to Sujith ManoharanFrom: Sujith Manoharan <[email protected]>
The internal regulator needs to be programmed
correctly for AR955x.
--- drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c +1 -1
@@ -4122,7 +4122,7 @@ static void ath9k_hw_ar9300_set_board_values(struct ath_hw *ah,ar9003_hw_xlna_bias_strength_apply (ah, is2ghz);ar9003_hw_atten_apply (ah, chan);ar9003_hw_quick_drop_apply (ah, chan->channel); -if (!AR_SREV_9330 (ah) && !AR_SREV_9340 (ah) && !AR_SREV_9550 (ah)) +if (!AR_SREV_9330 (ah) && !AR_SREV_9340 (ah))ar9003_hw_internal_regulator_apply (ah);ar9003_hw_apply_tuning_caps (ah);ar9003_hw_txend_to_xpa_off_apply (ah, is2ghz);
Signature · 1 line
1.8.4.2
PATCH 16/16 ath9k: Apply tuning caps for AR9330 and AR9485
In reply to Sujith ManoharanFrom: Sujith Manoharan <[email protected]>
--- drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c +1 -1
@@ -3965,7 +3965,7 @@ static void ar9003_hw_apply_tuning_caps(struct ath_hw *ah)struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;u8 tuning_caps_param = eep->baseEepHeader.params_for_tuning_caps[0 ]; -if (AR_SREV_9485 (ah) ||AR_SREV_9330 (ah) ||AR_SREV_9340 (ah)) +if (AR_SREV_9340 (ah))return ;if (eep->baseEepHeader.featureEnable &0x40 ) {
Signature · 1 line
1.8.4.2