ath9k_hw: update initvals for AR9003

This synchs up the initvals to the values used on the
Atheros HAL for AR9003. This specific change adds support
for a new high power module.

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/ath/ath9k/ar9003_initvals.h b/drivers/net/wireless/ath/ath9k/ar9003_initvals.h
index e0391b1..a131cd1 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/ar9003_initvals.h
+++ b/drivers/net/wireless/ath/ath9k/ar9003_initvals.h
@@ -31,7 +31,7 @@ static const u32 ar9300_2p0_radio_postamble[][5] = {
 
 static const u32 ar9300Modes_lowest_ob_db_tx_gain_table_2p0[][5] = {
        /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
-       {0x0000a410, 0x000050da, 0x000050da, 0x000050da, 0x000050da},
+       {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d9, 0x000050d9},
        {0x0000a500, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
        {0x0000a504, 0x06000003, 0x06000003, 0x04000002, 0x04000002},
        {0x0000a508, 0x0a000020, 0x0a000020, 0x08000004, 0x08000004},
@@ -545,7 +545,7 @@ static const u32 ar9300_2p0_soc_postamble[][5] = {
 };
 
 static const u32 ar9200_merlin_2p0_radio_core[][2] = {
-       /* Addr      common    */
+       /* Addr      allmodes  */
        {0x00007800, 0x00040000},
        {0x00007804, 0xdb005012},
        {0x00007808, 0x04924914},
@@ -835,71 +835,71 @@ static const u32 ar9300_2p0_baseband_core[][2] = {
 
 static const u32 ar9300Modes_high_power_tx_gain_table_2p0[][5] = {
        /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
-       {0x0000a410, 0x000050d9, 0x000050d9, 0x000050da, 0x000050da},
+       {0x0000a410, 0x000050db, 0x000050db, 0x000050d9, 0x000050d9},
        {0x0000a500, 0x00020220, 0x00020220, 0x00000000, 0x00000000},
        {0x0000a504, 0x06020223, 0x06020223, 0x04000002, 0x04000002},
-       {0x0000a508, 0x0b022220, 0x0b022220, 0x08000004, 0x08000004},
-       {0x0000a50c, 0x10022223, 0x10022223, 0x0b000200, 0x0b000200},
-       {0x0000a510, 0x17022620, 0x17022620, 0x0f000202, 0x0f000202},
-       {0x0000a514, 0x1b022622, 0x1b022622, 0x11000400, 0x11000400},
-       {0x0000a518, 0x1f022822, 0x1f022822, 0x15000402, 0x15000402},
-       {0x0000a51c, 0x24022842, 0x24022842, 0x19000404, 0x19000404},
-       {0x0000a520, 0x28042840, 0x28042840, 0x1b000603, 0x1b000603},
-       {0x0000a524, 0x2c042842, 0x2c042842, 0x1f000a02, 0x1f000a02},
-       {0x0000a528, 0x30042844, 0x30042844, 0x23000a04, 0x23000a04},
-       {0x0000a52c, 0x34042846, 0x34042846, 0x26000a20, 0x26000a20},
-       {0x0000a530, 0x39042869, 0x39042869, 0x2a000e20, 0x2a000e20},
-       {0x0000a534, 0x3d062869, 0x3d062869, 0x2e000e22, 0x2e000e22},
-       {0x0000a538, 0x44062c69, 0x44062c69, 0x31000e24, 0x31000e24},
-       {0x0000a53c, 0x48063069, 0x48063069, 0x34001640, 0x34001640},
-       {0x0000a540, 0x4c0a3065, 0x4c0a3065, 0x38001660, 0x38001660},
-       {0x0000a544, 0x500a3069, 0x500a3069, 0x3b001861, 0x3b001861},
-       {0x0000a548, 0x530a3469, 0x530a3469, 0x3e001a81, 0x3e001a81},
-       {0x0000a54c, 0x590a7464, 0x590a7464, 0x42001a83, 0x42001a83},
-       {0x0000a550, 0x5e0a7865, 0x5e0a7865, 0x44001c84, 0x44001c84},
-       {0x0000a554, 0x630a7e66, 0x630a7e66, 0x48001ce3, 0x48001ce3},
-       {0x0000a558, 0x680a7e89, 0x680a7e89, 0x4c001ce5, 0x4c001ce5},
-       {0x0000a55c, 0x6e0a7e8c, 0x6e0a7e8c, 0x50001ce9, 0x50001ce9},
-       {0x0000a560, 0x730e7e8c, 0x730e7e8c, 0x54001ceb, 0x54001ceb},
-       {0x0000a564, 0x730e7e8c, 0x730e7e8c, 0x56001eec, 0x56001eec},
-       {0x0000a568, 0x730e7e8c, 0x730e7e8c, 0x56001eec, 0x56001eec},
-       {0x0000a56c, 0x730e7e8c, 0x730e7e8c, 0x56001eec, 0x56001eec},
-       {0x0000a570, 0x730e7e8c, 0x730e7e8c, 0x56001eec, 0x56001eec},
-       {0x0000a574, 0x730e7e8c, 0x730e7e8c, 0x56001eec, 0x56001eec},
-       {0x0000a578, 0x730e7e8c, 0x730e7e8c, 0x56001eec, 0x56001eec},
-       {0x0000a57c, 0x730e7e8c, 0x730e7e8c, 0x56001eec, 0x56001eec},
+       {0x0000a508, 0x0a022220, 0x0a022220, 0x08000004, 0x08000004},
+       {0x0000a50c, 0x0f022223, 0x0f022223, 0x0b000200, 0x0b000200},
+       {0x0000a510, 0x14022620, 0x14022620, 0x0f000202, 0x0f000202},
+       {0x0000a514, 0x18022622, 0x18022622, 0x11000400, 0x11000400},
+       {0x0000a518, 0x1b022822, 0x1b022822, 0x15000402, 0x15000402},
+       {0x0000a51c, 0x20022842, 0x20022842, 0x19000404, 0x19000404},
+       {0x0000a520, 0x22022c41, 0x22022c41, 0x1b000603, 0x1b000603},
+       {0x0000a524, 0x28023042, 0x28023042, 0x1f000a02, 0x1f000a02},
+       {0x0000a528, 0x2c023044, 0x2c023044, 0x23000a04, 0x23000a04},
+       {0x0000a52c, 0x2f023644, 0x2f023644, 0x26000a20, 0x26000a20},
+       {0x0000a530, 0x34043643, 0x34043643, 0x2a000e20, 0x2a000e20},
+       {0x0000a534, 0x38043a44, 0x38043a44, 0x2e000e22, 0x2e000e22},
+       {0x0000a538, 0x3b043e45, 0x3b043e45, 0x31000e24, 0x31000e24},
+       {0x0000a53c, 0x40063e46, 0x40063e46, 0x34001640, 0x34001640},
+       {0x0000a540, 0x44083e46, 0x44083e46, 0x38001660, 0x38001660},
+       {0x0000a544, 0x46083e66, 0x46083e66, 0x3b001861, 0x3b001861},
+       {0x0000a548, 0x4b0a3e69, 0x4b0a3e69, 0x3e001a81, 0x3e001a81},
+       {0x0000a54c, 0x4f0a5e66, 0x4f0a5e66, 0x42001a83, 0x42001a83},
+       {0x0000a550, 0x540a7e66, 0x540a7e66, 0x44001c84, 0x44001c84},
+       {0x0000a554, 0x570a7e89, 0x570a7e89, 0x48001ce3, 0x48001ce3},
+       {0x0000a558, 0x5c0e7e8a, 0x5c0e7e8a, 0x4c001ce5, 0x4c001ce5},
+       {0x0000a55c, 0x60127e8b, 0x60127e8b, 0x50001ce9, 0x50001ce9},
+       {0x0000a560, 0x65127ecc, 0x65127ecc, 0x54001ceb, 0x54001ceb},
+       {0x0000a564, 0x6b169ecd, 0x6b169ecd, 0x56001eec, 0x56001eec},
+       {0x0000a568, 0x70169f0e, 0x70169f0e, 0x56001eec, 0x56001eec},
+       {0x0000a56c, 0x75169f4f, 0x75169f4f, 0x56001eec, 0x56001eec},
+       {0x0000a570, 0x75169f4f, 0x75169f4f, 0x56001eec, 0x56001eec},
+       {0x0000a574, 0x75169f4f, 0x75169f4f, 0x56001eec, 0x56001eec},
+       {0x0000a578, 0x75169f4f, 0x75169f4f, 0x56001eec, 0x56001eec},
+       {0x0000a57c, 0x75169f4f, 0x75169f4f, 0x56001eec, 0x56001eec},
        {0x0000a580, 0x00820220, 0x00820220, 0x00800000, 0x00800000},
        {0x0000a584, 0x06820223, 0x06820223, 0x04800002, 0x04800002},
-       {0x0000a588, 0x0b822220, 0x0b822220, 0x08800004, 0x08800004},
-       {0x0000a58c, 0x10822223, 0x10822223, 0x0b800200, 0x0b800200},
-       {0x0000a590, 0x17822620, 0x17822620, 0x0f800202, 0x0f800202},
-       {0x0000a594, 0x1b822622, 0x1b822622, 0x11800400, 0x11800400},
-       {0x0000a598, 0x1f822822, 0x1f822822, 0x15800402, 0x15800402},
-       {0x0000a59c, 0x24822842, 0x24822842, 0x19800404, 0x19800404},
-       {0x0000a5a0, 0x28842840, 0x28842840, 0x1b800603, 0x1b800603},
-       {0x0000a5a4, 0x2c842842, 0x2c842842, 0x1f800a02, 0x1f800a02},
-       {0x0000a5a8, 0x30842844, 0x30842844, 0x23800a04, 0x23800a04},
-       {0x0000a5ac, 0x34842846, 0x34842846, 0x26800a20, 0x26800a20},
-       {0x0000a5b0, 0x39842869, 0x39842869, 0x2a800e20, 0x2a800e20},
-       {0x0000a5b4, 0x3d862869, 0x3d862869, 0x2e800e22, 0x2e800e22},
-       {0x0000a5b8, 0x44862c69, 0x44862c69, 0x31800e24, 0x31800e24},
-       {0x0000a5bc, 0x48863069, 0x48863069, 0x34801640, 0x34801640},
-       {0x0000a5c0, 0x4c8a3065, 0x4c8a3065, 0x38801660, 0x38801660},
-       {0x0000a5c4, 0x508a3069, 0x508a3069, 0x3b801861, 0x3b801861},
-       {0x0000a5c8, 0x538a3469, 0x538a3469, 0x3e801a81, 0x3e801a81},
-       {0x0000a5cc, 0x598a7464, 0x598a7464, 0x42801a83, 0x42801a83},
-       {0x0000a5d0, 0x5e8a7865, 0x5e8a7865, 0x44801c84, 0x44801c84},
-       {0x0000a5d4, 0x638a7e66, 0x638a7e66, 0x48801ce3, 0x48801ce3},
-       {0x0000a5d8, 0x688a7e89, 0x688a7e89, 0x4c801ce5, 0x4c801ce5},
-       {0x0000a5dc, 0x6e8a7e8c, 0x6e8a7e8c, 0x50801ce9, 0x50801ce9},
-       {0x0000a5e0, 0x738e7e8c, 0x738e7e8c, 0x54801ceb, 0x54801ceb},
-       {0x0000a5e4, 0x738e7e8c, 0x738e7e8c, 0x56801eec, 0x56801eec},
-       {0x0000a5e8, 0x738e7e8c, 0x738e7e8c, 0x56801eec, 0x56801eec},
-       {0x0000a5ec, 0x738e7e8c, 0x738e7e8c, 0x56801eec, 0x56801eec},
-       {0x0000a5f0, 0x738e7e8c, 0x738e7e8c, 0x56801eec, 0x56801eec},
-       {0x0000a5f4, 0x738e7e8c, 0x738e7e8c, 0x56801eec, 0x56801eec},
-       {0x0000a5f8, 0x738e7e8c, 0x738e7e8c, 0x56801eec, 0x56801eec},
-       {0x0000a5fc, 0x738e7e8c, 0x738e7e8c, 0x56801eec, 0x56801eec},
+       {0x0000a588, 0x0a822220, 0x0a822220, 0x08800004, 0x08800004},
+       {0x0000a58c, 0x0f822223, 0x0f822223, 0x0b800200, 0x0b800200},
+       {0x0000a590, 0x14822620, 0x14822620, 0x0f800202, 0x0f800202},
+       {0x0000a594, 0x18822622, 0x18822622, 0x11800400, 0x11800400},
+       {0x0000a598, 0x1b822822, 0x1b822822, 0x15800402, 0x15800402},
+       {0x0000a59c, 0x20822842, 0x20822842, 0x19800404, 0x19800404},
+       {0x0000a5a0, 0x22822c41, 0x22822c41, 0x1b800603, 0x1b800603},
+       {0x0000a5a4, 0x28823042, 0x28823042, 0x1f800a02, 0x1f800a02},
+       {0x0000a5a8, 0x2c823044, 0x2c823044, 0x23800a04, 0x23800a04},
+       {0x0000a5ac, 0x2f823644, 0x2f823644, 0x26800a20, 0x26800a20},
+       {0x0000a5b0, 0x34843643, 0x34843643, 0x2a800e20, 0x2a800e20},
+       {0x0000a5b4, 0x38843a44, 0x38843a44, 0x2e800e22, 0x2e800e22},
+       {0x0000a5b8, 0x3b843e45, 0x3b843e45, 0x31800e24, 0x31800e24},
+       {0x0000a5bc, 0x40863e46, 0x40863e46, 0x34801640, 0x34801640},
+       {0x0000a5c0, 0x4c8a3065, 0x44883e46, 0x44883e46, 0x38801660},
+       {0x0000a5c4, 0x46883e66, 0x46883e66, 0x3b801861, 0x3b801861},
+       {0x0000a5c8, 0x4b8a3e69, 0x4b8a3e69, 0x3e801a81, 0x3e801a81},
+       {0x0000a5cc, 0x4f8a5e66, 0x4f8a5e66, 0x42801a83, 0x42801a83},
+       {0x0000a5d0, 0x548a7e66, 0x548a7e66, 0x44801c84, 0x44801c84},
+       {0x0000a5d4, 0x578a7e89, 0x578a7e89, 0x48801ce3, 0x48801ce3},
+       {0x0000a5d8, 0x5c8e7e8a, 0x5c8e7e8a, 0x4c801ce5, 0x4c801ce5},
+       {0x0000a5dc, 0x60927e8b, 0x60927e8b, 0x50801ce9, 0x50801ce9},
+       {0x0000a5e0, 0x65927ecc, 0x65927ecc, 0x54801ceb, 0x54801ceb},
+       {0x0000a5e4, 0x6b969ecd, 0x6b969ecd, 0x56801eec, 0x56801eec},
+       {0x0000a5e8, 0x70969f0e, 0x70969f0e, 0x56801eec, 0x56801eec},
+       {0x0000a5ec, 0x75969f4f, 0x75969f4f, 0x56801eec, 0x56801eec},
+       {0x0000a5f0, 0x75969f4f, 0x75969f4f, 0x56801eec, 0x56801eec},
+       {0x0000a5f4, 0x75969f4f, 0x75969f4f, 0x56801eec, 0x56801eec},
+       {0x0000a5f8, 0x75969f4f, 0x75969f4f, 0x56801eec, 0x56801eec},
+       {0x0000a5fc, 0x75969f4f, 0x75969f4f, 0x56801eec, 0x56801eec},
        {0x00016044, 0x056db2e6, 0x056db2e6, 0x056db2e6, 0x056db2e6},
        {0x00016048, 0xad241a61, 0xad241a61, 0xad241a61, 0xad241a61},
        {0x00016068, 0x6eb6db6c, 0x6eb6db6c, 0x6eb6db6c, 0x6eb6db6c},
@@ -913,71 +913,71 @@ static const u32 ar9300Modes_high_power_tx_gain_table_2p0[][5] = {
 
 static const u32 ar9300Modes_high_ob_db_tx_gain_table_2p0[][5] = {
        /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
-       {0x0000a410, 0x000050d9, 0x000050d9, 0x000050da, 0x000050da},
+       {0x0000a410, 0x000050db, 0x000050db, 0x000050d9, 0x000050d9},
        {0x0000a500, 0x00020220, 0x00020220, 0x00000000, 0x00000000},
        {0x0000a504, 0x06020223, 0x06020223, 0x04000002, 0x04000002},
-       {0x0000a508, 0x0b022220, 0x0b022220, 0x08000004, 0x08000004},
-       {0x0000a50c, 0x10022223, 0x10022223, 0x0b000200, 0x0b000200},
-       {0x0000a510, 0x17022620, 0x17022620, 0x0f000202, 0x0f000202},
-       {0x0000a514, 0x1b022622, 0x1b022622, 0x11000400, 0x11000400},
-       {0x0000a518, 0x1f022822, 0x1f022822, 0x15000402, 0x15000402},
-       {0x0000a51c, 0x24022842, 0x24022842, 0x19000404, 0x19000404},
-       {0x0000a520, 0x28042840, 0x28042840, 0x1b000603, 0x1b000603},
-       {0x0000a524, 0x2c042842, 0x2c042842, 0x1f000a02, 0x1f000a02},
-       {0x0000a528, 0x30042844, 0x30042844, 0x23000a04, 0x23000a04},
-       {0x0000a52c, 0x34042846, 0x34042846, 0x26000a20, 0x26000a20},
-       {0x0000a530, 0x39042869, 0x39042869, 0x2a000e20, 0x2a000e20},
-       {0x0000a534, 0x3d062869, 0x3d062869, 0x2e000e22, 0x2e000e22},
-       {0x0000a538, 0x44062c69, 0x44062c69, 0x31000e24, 0x31000e24},
-       {0x0000a53c, 0x48063069, 0x48063069, 0x34001640, 0x34001640},
-       {0x0000a540, 0x4c0a3065, 0x4c0a3065, 0x38001660, 0x38001660},
-       {0x0000a544, 0x500a3069, 0x500a3069, 0x3b001861, 0x3b001861},
-       {0x0000a548, 0x530a3469, 0x530a3469, 0x3e001a81, 0x3e001a81},
-       {0x0000a54c, 0x590a7464, 0x590a7464, 0x42001a83, 0x42001a83},
-       {0x0000a550, 0x5e0a7865, 0x5e0a7865, 0x44001c84, 0x44001c84},
-       {0x0000a554, 0x630a7e66, 0x630a7e66, 0x48001ce3, 0x48001ce3},
-       {0x0000a558, 0x680a7e89, 0x680a7e89, 0x4c001ce5, 0x4c001ce5},
-       {0x0000a55c, 0x6e0a7e8c, 0x6e0a7e8c, 0x50001ce9, 0x50001ce9},
-       {0x0000a560, 0x730e7e8c, 0x730e7e8c, 0x54001ceb, 0x54001ceb},
-       {0x0000a564, 0x730e7e8c, 0x730e7e8c, 0x56001eec, 0x56001eec},
-       {0x0000a568, 0x730e7e8c, 0x730e7e8c, 0x56001eec, 0x56001eec},
-       {0x0000a56c, 0x730e7e8c, 0x730e7e8c, 0x56001eec, 0x56001eec},
-       {0x0000a570, 0x730e7e8c, 0x730e7e8c, 0x56001eec, 0x56001eec},
-       {0x0000a574, 0x730e7e8c, 0x730e7e8c, 0x56001eec, 0x56001eec},
-       {0x0000a578, 0x730e7e8c, 0x730e7e8c, 0x56001eec, 0x56001eec},
-       {0x0000a57c, 0x730e7e8c, 0x730e7e8c, 0x56001eec, 0x56001eec},
+       {0x0000a508, 0x0a022220, 0x0a022220, 0x08000004, 0x08000004},
+       {0x0000a50c, 0x0f022223, 0x0f022223, 0x0b000200, 0x0b000200},
+       {0x0000a510, 0x14022620, 0x14022620, 0x0f000202, 0x0f000202},
+       {0x0000a514, 0x18022622, 0x18022622, 0x11000400, 0x11000400},
+       {0x0000a518, 0x1b022822, 0x1b022822, 0x15000402, 0x15000402},
+       {0x0000a51c, 0x20022842, 0x20022842, 0x19000404, 0x19000404},
+       {0x0000a520, 0x22022c41, 0x22022c41, 0x1b000603, 0x1b000603},
+       {0x0000a524, 0x28023042, 0x28023042, 0x1f000a02, 0x1f000a02},
+       {0x0000a528, 0x2c023044, 0x2c023044, 0x23000a04, 0x23000a04},
+       {0x0000a52c, 0x2f023644, 0x2f023644, 0x26000a20, 0x26000a20},
+       {0x0000a530, 0x34043643, 0x34043643, 0x2a000e20, 0x2a000e20},
+       {0x0000a534, 0x38043a44, 0x38043a44, 0x2e000e22, 0x2e000e22},
+       {0x0000a538, 0x3b043e45, 0x3b043e45, 0x31000e24, 0x31000e24},
+       {0x0000a53c, 0x40063e46, 0x40063e46, 0x34001640, 0x34001640},
+       {0x0000a540, 0x44083e46, 0x44083e46, 0x38001660, 0x38001660},
+       {0x0000a544, 0x46083e66, 0x46083e66, 0x3b001861, 0x3b001861},
+       {0x0000a548, 0x4b0a3e69, 0x4b0a3e69, 0x3e001a81, 0x3e001a81},
+       {0x0000a54c, 0x4f0a5e66, 0x4f0a5e66, 0x42001a83, 0x42001a83},
+       {0x0000a550, 0x540a7e66, 0x540a7e66, 0x44001c84, 0x44001c84},
+       {0x0000a554, 0x570a7e89, 0x570a7e89, 0x48001ce3, 0x48001ce3},
+       {0x0000a558, 0x5c0e7e8a, 0x5c0e7e8a, 0x4c001ce5, 0x4c001ce5},
+       {0x0000a55c, 0x60127e8b, 0x60127e8b, 0x50001ce9, 0x50001ce9},
+       {0x0000a560, 0x65127ecc, 0x65127ecc, 0x54001ceb, 0x54001ceb},
+       {0x0000a564, 0x6b169ecd, 0x6b169ecd, 0x56001eec, 0x56001eec},
+       {0x0000a568, 0x70169f0e, 0x70169f0e, 0x56001eec, 0x56001eec},
+       {0x0000a56c, 0x75169f4f, 0x75169f4f, 0x56001eec, 0x56001eec},
+       {0x0000a570, 0x75169f4f, 0x75169f4f, 0x56001eec, 0x56001eec},
+       {0x0000a574, 0x75169f4f, 0x75169f4f, 0x56001eec, 0x56001eec},
+       {0x0000a578, 0x75169f4f, 0x75169f4f, 0x56001eec, 0x56001eec},
+       {0x0000a57c, 0x75169f4f, 0x75169f4f, 0x56001eec, 0x56001eec},
        {0x0000a580, 0x00820220, 0x00820220, 0x00800000, 0x00800000},
        {0x0000a584, 0x06820223, 0x06820223, 0x04800002, 0x04800002},
-       {0x0000a588, 0x0b822220, 0x0b822220, 0x08800004, 0x08800004},
-       {0x0000a58c, 0x10822223, 0x10822223, 0x0b800200, 0x0b800200},
-       {0x0000a590, 0x17822620, 0x17822620, 0x0f800202, 0x0f800202},
-       {0x0000a594, 0x1b822622, 0x1b822622, 0x11800400, 0x11800400},
-       {0x0000a598, 0x1f822822, 0x1f822822, 0x15800402, 0x15800402},
-       {0x0000a59c, 0x24822842, 0x24822842, 0x19800404, 0x19800404},
-       {0x0000a5a0, 0x28842840, 0x28842840, 0x1b800603, 0x1b800603},
-       {0x0000a5a4, 0x2c842842, 0x2c842842, 0x1f800a02, 0x1f800a02},
-       {0x0000a5a8, 0x30842844, 0x30842844, 0x23800a04, 0x23800a04},
-       {0x0000a5ac, 0x34842846, 0x34842846, 0x26800a20, 0x26800a20},
-       {0x0000a5b0, 0x39842869, 0x39842869, 0x2a800e20, 0x2a800e20},
-       {0x0000a5b4, 0x3d862869, 0x3d862869, 0x2e800e22, 0x2e800e22},
-       {0x0000a5b8, 0x44862c69, 0x44862c69, 0x31800e24, 0x31800e24},
-       {0x0000a5bc, 0x48863069, 0x48863069, 0x34801640, 0x34801640},
-       {0x0000a5c0, 0x4c8a3065, 0x4c8a3065, 0x38801660, 0x38801660},
-       {0x0000a5c4, 0x508a3069, 0x508a3069, 0x3b801861, 0x3b801861},
-       {0x0000a5c8, 0x538a3469, 0x538a3469, 0x3e801a81, 0x3e801a81},
-       {0x0000a5cc, 0x598a7464, 0x598a7464, 0x42801a83, 0x42801a83},
-       {0x0000a5d0, 0x5e8a7865, 0x5e8a7865, 0x44801c84, 0x44801c84},
-       {0x0000a5d4, 0x638a7e66, 0x638a7e66, 0x48801ce3, 0x48801ce3},
-       {0x0000a5d8, 0x688a7e89, 0x688a7e89, 0x4c801ce5, 0x4c801ce5},
-       {0x0000a5dc, 0x6e8a7e8c, 0x6e8a7e8c, 0x50801ce9, 0x50801ce9},
-       {0x0000a5e0, 0x738e7e8c, 0x738e7e8c, 0x54801ceb, 0x54801ceb},
-       {0x0000a5e4, 0x738e7e8c, 0x738e7e8c, 0x56801eec, 0x56801eec},
-       {0x0000a5e8, 0x738e7e8c, 0x738e7e8c, 0x56801eec, 0x56801eec},
-       {0x0000a5ec, 0x738e7e8c, 0x738e7e8c, 0x56801eec, 0x56801eec},
-       {0x0000a5f0, 0x738e7e8c, 0x738e7e8c, 0x56801eec, 0x56801eec},
-       {0x0000a5f4, 0x738e7e8c, 0x738e7e8c, 0x56801eec, 0x56801eec},
-       {0x0000a5f8, 0x738e7e8c, 0x738e7e8c, 0x56801eec, 0x56801eec},
-       {0x0000a5fc, 0x738e7e8c, 0x738e7e8c, 0x56801eec, 0x56801eec},
+       {0x0000a588, 0x0a822220, 0x0a822220, 0x08800004, 0x08800004},
+       {0x0000a58c, 0x0f822223, 0x0f822223, 0x0b800200, 0x0b800200},
+       {0x0000a590, 0x14822620, 0x14822620, 0x0f800202, 0x0f800202},
+       {0x0000a594, 0x18822622, 0x18822622, 0x11800400, 0x11800400},
+       {0x0000a598, 0x1b822822, 0x1b822822, 0x15800402, 0x15800402},
+       {0x0000a59c, 0x20822842, 0x20822842, 0x19800404, 0x19800404},
+       {0x0000a5a0, 0x22822c41, 0x22822c41, 0x1b800603, 0x1b800603},
+       {0x0000a5a4, 0x28823042, 0x28823042, 0x1f800a02, 0x1f800a02},
+       {0x0000a5a8, 0x2c823044, 0x2c823044, 0x23800a04, 0x23800a04},
+       {0x0000a5ac, 0x2f823644, 0x2f823644, 0x26800a20, 0x26800a20},
+       {0x0000a5b0, 0x34843643, 0x34843643, 0x2a800e20, 0x2a800e20},
+       {0x0000a5b4, 0x38843a44, 0x38843a44, 0x2e800e22, 0x2e800e22},
+       {0x0000a5b8, 0x3b843e45, 0x3b843e45, 0x31800e24, 0x31800e24},
+       {0x0000a5bc, 0x40863e46, 0x40863e46, 0x34801640, 0x34801640},
+       {0x0000a5c0, 0x44883e46, 0x44883e46, 0x38801660, 0x38801660},
+       {0x0000a5c4, 0x46883e66, 0x46883e66, 0x3b801861, 0x3b801861},
+       {0x0000a5c8, 0x4b8a3e69, 0x4b8a3e69, 0x3e801a81, 0x3e801a81},
+       {0x0000a5cc, 0x4f8a5e66, 0x4f8a5e66, 0x42801a83, 0x42801a83},
+       {0x0000a5d0, 0x548a7e66, 0x548a7e66, 0x44801c84, 0x44801c84},
+       {0x0000a5d4, 0x578a7e89, 0x578a7e89, 0x48801ce3, 0x48801ce3},
+       {0x0000a5d8, 0x5c8e7e8a, 0x5c8e7e8a, 0x4c801ce5, 0x4c801ce5},
+       {0x0000a5dc, 0x60927e8b, 0x60927e8b, 0x50801ce9, 0x50801ce9},
+       {0x0000a5e0, 0x65927ecc, 0x65927ecc, 0x54801ceb, 0x54801ceb},
+       {0x0000a5e4, 0x6b969ecd, 0x6b969ecd, 0x56801eec, 0x56801eec},
+       {0x0000a5e8, 0x70969f0e, 0x70969f0e, 0x56801eec, 0x56801eec},
+       {0x0000a5ec, 0x75969f4f, 0x75969f4f, 0x56801eec, 0x56801eec},
+       {0x0000a5f0, 0x75969f4f, 0x75969f4f, 0x56801eec, 0x56801eec},
+       {0x0000a5f4, 0x75969f4f, 0x75969f4f, 0x56801eec, 0x56801eec},
+       {0x0000a5f8, 0x75969f4f, 0x75969f4f, 0x56801eec, 0x56801eec},
+       {0x0000a5fc, 0x75969f4f, 0x75969f4f, 0x56801eec, 0x56801eec},
        {0x00016044, 0x056db2e4, 0x056db2e4, 0x056db2e4, 0x056db2e4},
        {0x00016048, 0x8c001a61, 0x8c001a61, 0x8c001a61, 0x8c001a61},
        {0x00016068, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
@@ -1251,7 +1251,7 @@ static const u32 ar9300Common_rx_gain_table_2p0[][2] = {
 
 static const u32 ar9300Modes_low_ob_db_tx_gain_table_2p0[][5] = {
        /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
-       {0x0000a410, 0x000050da, 0x000050da, 0x000050da, 0x000050da},
+       {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d9, 0x000050d9},
        {0x0000a500, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
        {0x0000a504, 0x06000003, 0x06000003, 0x04000002, 0x04000002},
        {0x0000a508, 0x0a000020, 0x0a000020, 0x08000004, 0x08000004},
@@ -1760,31 +1760,22 @@ static const u32 ar9300_2p0_soc_preamble[][2] = {
        {0x00007038, 0x000004c2},
 };
 
-/*
- * PCIE-PHY programming array, to be used prior to entering
- * full sleep (holding RTC in reset, PLL is ON in L1 mode)
- */
 static const u32 ar9300PciePhy_pll_on_clkreq_disable_L1_2p0[][2] = {
+       /* Addr      allmodes  */
        {0x00004040, 0x08212e5e},
        {0x00004040, 0x0008003b},
        {0x00004044, 0x00000000},
 };
 
-/*
- * PCIE-PHY programming array, to be used when not in
- * full sleep (holding RTC in reset)
- */
 static const u32 ar9300PciePhy_clkreq_enable_L1_2p0[][2] = {
+       /* Addr      allmodes  */
        {0x00004040, 0x08253e5e},
        {0x00004040, 0x0008003b},
        {0x00004044, 0x00000000},
 };
 
-/*
- * PCIE-PHY programming array, to be used prior to entering
- * full sleep (holding RTC in reset)
- */
 static const u32 ar9300PciePhy_clkreq_disable_L1_2p0[][2] = {
+       /* Addr      allmodes  */
        {0x00004040, 0x08213e5e},
        {0x00004040, 0x0008003b},
        {0x00004044, 0x00000000},