- static void ar9003_rx_gain_table_mode0(struct ath_hw *ah)
-@@ -673,7 +704,7 @@ void ar9003_hw_attach_ops(struct ath_hw
- struct ath_hw_private_ops *priv_ops = ath9k_hw_private_ops(ah);
- struct ath_hw_ops *ops = ath9k_hw_ops(ah);
-
-- priv_ops->init_mode_regs = ar9003_hw_init_mode_regs;
-+ ar9003_hw_init_mode_regs(ah);
- priv_ops->init_mode_gain_regs = ar9003_hw_init_mode_gain_regs;
-
- ops->config_pci_powersave = ar9003_hw_configpcipowersave;
---- a/drivers/net/wireless/ath/ath9k/ar9340_initvals.h
-+++ b/drivers/net/wireless/ath/ath9k/ar9340_initvals.h
-@@ -1172,6 +1172,106 @@ static const u32 ar9340Modes_mixed_ob_db
- {0x00016448, 0x24925666, 0x24925666, 0x8e481266, 0x8e481266},
- };
-
-+static const u32 ar9340Modes_low_ob_db_and_spur_tx_gain_table_1p0[][5] = {
-+ /* Addr 5G_HT20 5G_HT40 2G_HT40 2G_HT20 */
-+ {0x0000a2dc, 0x0380c7fc, 0x0380c7fc, 0x03eaac5a, 0x03eaac5a},
-+ {0x0000a2e0, 0x0000f800, 0x0000f800, 0x03f330ac, 0x03f330ac},
-+ {0x0000a2e4, 0x03ff0000, 0x03ff0000, 0x03fc3f00, 0x03fc3f00},
-+ {0x0000a2e8, 0x00000000, 0x00000000, 0x03ffc000, 0x03ffc000},
-+ {0x0000a394, 0x00000444, 0x00000444, 0x00000404, 0x00000404},
-+ {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d9, 0x000050d9},
-+ {0x0000a500, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-+ {0x0000a504, 0x06000003, 0x06000003, 0x02000001, 0x02000001},
-+ {0x0000a508, 0x0a000020, 0x0a000020, 0x05000003, 0x05000003},
-+ {0x0000a50c, 0x10000023, 0x10000023, 0x0a000005, 0x0a000005},
-+ {0x0000a510, 0x16000220, 0x16000220, 0x0e000201, 0x0e000201},
-+ {0x0000a514, 0x1c000223, 0x1c000223, 0x11000203, 0x11000203},
-+ {0x0000a518, 0x21002220, 0x21002220, 0x14000401, 0x14000401},
-+ {0x0000a51c, 0x27002223, 0x27002223, 0x18000403, 0x18000403},
-+ {0x0000a520, 0x2b022220, 0x2b022220, 0x1b000602, 0x1b000602},
-+ {0x0000a524, 0x2f022222, 0x2f022222, 0x1f000802, 0x1f000802},
-+ {0x0000a528, 0x34022225, 0x34022225, 0x21000620, 0x21000620},
-+ {0x0000a52c, 0x3a02222a, 0x3a02222a, 0x25000820, 0x25000820},
-+ {0x0000a530, 0x3e02222c, 0x3e02222c, 0x29000822, 0x29000822},
-+ {0x0000a534, 0x4202242a, 0x4202242a, 0x2d000824, 0x2d000824},
-+ {0x0000a538, 0x4702244a, 0x4702244a, 0x30000828, 0x30000828},
-+ {0x0000a53c, 0x4b02244c, 0x4b02244c, 0x3400082a, 0x3400082a},
-+ {0x0000a540, 0x4e02246c, 0x4e02246c, 0x38000849, 0x38000849},
-+ {0x0000a544, 0x5302266c, 0x5302266c, 0x3b000a2c, 0x3b000a2c},
-+ {0x0000a548, 0x5702286c, 0x5702286c, 0x3e000e2b, 0x3e000e2b},
-+ {0x0000a54c, 0x5c02486b, 0x5c02486b, 0x42000e2d, 0x42000e2d},
-+ {0x0000a550, 0x61024a6c, 0x61024a6c, 0x4500124a, 0x4500124a},
-+ {0x0000a554, 0x66026a6c, 0x66026a6c, 0x4900124c, 0x4900124c},
-+ {0x0000a558, 0x6b026e6c, 0x6b026e6c, 0x4c00126c, 0x4c00126c},
-+ {0x0000a55c, 0x7002708c, 0x7002708c, 0x4f00128c, 0x4f00128c},
-+ {0x0000a560, 0x7302b08a, 0x7302b08a, 0x52001290, 0x52001290},
-+ {0x0000a564, 0x7702b08c, 0x7702b08c, 0x56001292, 0x56001292},
-+ {0x0000a568, 0x7702b08c, 0x7702b08c, 0x56001292, 0x56001292},
-+ {0x0000a56c, 0x7702b08c, 0x7702b08c, 0x56001292, 0x56001292},
-+ {0x0000a570, 0x7702b08c, 0x7702b08c, 0x56001292, 0x56001292},
-+ {0x0000a574, 0x7702b08c, 0x7702b08c, 0x56001292, 0x56001292},
-+ {0x0000a578, 0x7702b08c, 0x7702b08c, 0x56001292, 0x56001292},
-+ {0x0000a57c, 0x7702b08c, 0x7702b08c, 0x56001292, 0x56001292},
-+ {0x0000a580, 0x00800000, 0x00800000, 0x00800000, 0x00800000},
-+ {0x0000a584, 0x06800003, 0x06800003, 0x02800001, 0x02800001},
-+ {0x0000a588, 0x0a800020, 0x0a800020, 0x05800003, 0x05800003},
-+ {0x0000a58c, 0x10800023, 0x10800023, 0x0a800005, 0x0a800005},
-+ {0x0000a590, 0x16800220, 0x16800220, 0x0e800201, 0x0e800201},
-+ {0x0000a594, 0x1c800223, 0x1c800223, 0x11800203, 0x11800203},
-+ {0x0000a598, 0x21820220, 0x21820220, 0x14800401, 0x14800401},
-+ {0x0000a59c, 0x27820223, 0x27820223, 0x18800403, 0x18800403},
-+ {0x0000a5a0, 0x2b822220, 0x2b822220, 0x1b800602, 0x1b800602},
-+ {0x0000a5a4, 0x2f822222, 0x2f822222, 0x1f800802, 0x1f800802},
-+ {0x0000a5a8, 0x34822225, 0x34822225, 0x21800620, 0x21800620},
-+ {0x0000a5ac, 0x3a82222a, 0x3a82222a, 0x25800820, 0x25800820},
-+ {0x0000a5b0, 0x3e82222c, 0x3e82222c, 0x29800822, 0x29800822},
-+ {0x0000a5b4, 0x4282242a, 0x4282242a, 0x2d800824, 0x2d800824},
-+ {0x0000a5b8, 0x4782244a, 0x4782244a, 0x30800828, 0x30800828},
-+ {0x0000a5bc, 0x4b82244c, 0x4b82244c, 0x3480082a, 0x3480082a},
-+ {0x0000a5c0, 0x4e82246c, 0x4e82246c, 0x38800849, 0x38800849},
-+ {0x0000a5c4, 0x5382266c, 0x5382266c, 0x3b800a2c, 0x3b800a2c},
-+ {0x0000a5c8, 0x5782286c, 0x5782286c, 0x3e800e2b, 0x3e800e2b},
-+ {0x0000a5cc, 0x5c84286b, 0x5c84286b, 0x42800e2d, 0x42800e2d},
-+ {0x0000a5d0, 0x61842a6c, 0x61842a6c, 0x4580124a, 0x4580124a},
-+ {0x0000a5d4, 0x66862a6c, 0x66862a6c, 0x4980124c, 0x4980124c},
-+ {0x0000a5d8, 0x6b862e6c, 0x6b862e6c, 0x4c80126c, 0x4c80126c},
-+ {0x0000a5dc, 0x7086308c, 0x7086308c, 0x4f80128c, 0x4f80128c},
-+ {0x0000a5e0, 0x738a308a, 0x738a308a, 0x52801290, 0x52801290},
-+ {0x0000a5e4, 0x778a308c, 0x778a308c, 0x56801292, 0x56801292},
-+ {0x0000a5e8, 0x778a308c, 0x778a308c, 0x56801292, 0x56801292},
-+ {0x0000a5ec, 0x778a308c, 0x778a308c, 0x56801292, 0x56801292},
-+ {0x0000a5f0, 0x778a308c, 0x778a308c, 0x56801292, 0x56801292},
-+ {0x0000a5f4, 0x778a308c, 0x778a308c, 0x56801292, 0x56801292},
-+ {0x0000a5f8, 0x778a308c, 0x778a308c, 0x56801292, 0x56801292},
-+ {0x0000a5fc, 0x778a308c, 0x778a308c, 0x56801292, 0x56801292},
-+ {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, 0x01404501, 0x01404501},
-+ {0x0000a618, 0x01404501, 0x01404501, 0x01404501, 0x01404501},
-+ {0x0000a61c, 0x02008802, 0x02008802, 0x01404501, 0x01404501},
-+ {0x0000a620, 0x0300cc03, 0x0300cc03, 0x03c0cf02, 0x03c0cf02},
-+ {0x0000a624, 0x0300cc03, 0x0300cc03, 0x03c0cf03, 0x03c0cf03},
-+ {0x0000a628, 0x0300cc03, 0x0300cc03, 0x04011004, 0x04011004},
-+ {0x0000a62c, 0x03810c03, 0x03810c03, 0x05419405, 0x05419405},
-+ {0x0000a630, 0x03810e04, 0x03810e04, 0x05419506, 0x05419506},
-+ {0x0000a634, 0x03810e04, 0x03810e04, 0x05419506, 0x05419506},
-+ {0x0000a638, 0x03810e04, 0x03810e04, 0x05419506, 0x05419506},
-+ {0x0000a63c, 0x03810e04, 0x03810e04, 0x05419506, 0x05419506},
-+ {0x0000b2dc, 0x0380c7fc, 0x0380c7fc, 0x03eaac5a, 0x03eaac5a},
-+ {0x0000b2e0, 0x0000f800, 0x0000f800, 0x03f330ac, 0x03f330ac},
-+ {0x0000b2e4, 0x03ff0000, 0x03ff0000, 0x03fc3f00, 0x03fc3f00},
-+ {0x0000b2e8, 0x00000000, 0x00000000, 0x03ffc000, 0x03ffc000},
-+ {0x00016044, 0x022492db, 0x022492db, 0x022492db, 0x022492db},
-+ {0x00016048, 0x24925666, 0x24925666, 0x24925266, 0x24925266},
-+ {0x00016280, 0x01000015, 0x01000015, 0x01001015, 0x01001015},
-+ {0x00016288, 0xf0318000, 0xf0318000, 0xf0318000, 0xf0318000},
-+ {0x00016444, 0x022492db, 0x022492db, 0x022492db, 0x022492db},
-+ {0x00016448, 0x24925666, 0x24925666, 0x24925266, 0x24925266},
-+};
-+
- static const u32 ar9340_1p0_mac_core[][2] = {
- /* Addr allmodes */
- {0x00000008, 0x00000000},
---- a/drivers/net/wireless/ath/ath9k/ar9485_initvals.h
-+++ b/drivers/net/wireless/ath/ath9k/ar9485_initvals.h
-@@ -260,6 +260,79 @@ static const u32 ar9485Modes_high_power_
- {0x00016048, 0x6c924260, 0x6c924260, 0x6c924260, 0x6c924260},
- };
-
-+static const u32 ar9485Modes_green_ob_db_tx_gain_1_1[][5] = {
-+ /* Addr 5G_HT20 5G_HT40 2G_HT40 2G_HT20 */
-+ {0x000098bc, 0x00000003, 0x00000003, 0x00000003, 0x00000003},
-+ {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d8, 0x000050d8},
-+ {0x0000a458, 0x80000000, 0x80000000, 0x80000000, 0x80000000},
-+ {0x0000a500, 0x00022200, 0x00022200, 0x00000006, 0x00000006},
-+ {0x0000a504, 0x05062002, 0x05062002, 0x03000201, 0x03000201},
-+ {0x0000a508, 0x0c002e00, 0x0c002e00, 0x06000203, 0x06000203},
-+ {0x0000a50c, 0x11062202, 0x11062202, 0x0a000401, 0x0a000401},
-+ {0x0000a510, 0x17022e00, 0x17022e00, 0x0e000403, 0x0e000403},
-+ {0x0000a514, 0x1d000ec2, 0x1d000ec2, 0x12000405, 0x12000405},
-+ {0x0000a518, 0x25020ec0, 0x25020ec0, 0x15000604, 0x15000604},
-+ {0x0000a51c, 0x2b020ec3, 0x2b020ec3, 0x18000605, 0x18000605},
-+ {0x0000a520, 0x2f001f04, 0x2f001f04, 0x1c000a04, 0x1c000a04},
-+ {0x0000a524, 0x35001fc4, 0x35001fc4, 0x21000a06, 0x21000a06},
-+ {0x0000a528, 0x3c022f04, 0x3c022f04, 0x29000a24, 0x29000a24},
-+ {0x0000a52c, 0x41023e85, 0x41023e85, 0x2f000e21, 0x2f000e21},
-+ {0x0000a530, 0x48023ec6, 0x48023ec6, 0x31000e20, 0x31000e20},
-+ {0x0000a534, 0x4d023f01, 0x4d023f01, 0x33000e20, 0x33000e20},
-+ {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},
-+ {0x0000b500, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
-+ {0x0000b504, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
-+ {0x0000b508, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
-+ {0x0000b50c, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
-+ {0x0000b510, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
-+ {0x0000b514, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
-+ {0x0000b518, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
-+ {0x0000b51c, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
-+ {0x0000b520, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
-+ {0x0000b524, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
-+ {0x0000b528, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
-+ {0x0000b52c, 0x0000002a, 0x0000002a, 0x0000002a, 0x0000002a},
-+ {0x0000b530, 0x0000003a, 0x0000003a, 0x0000003a, 0x0000003a},
-+ {0x0000b534, 0x0000004a, 0x0000004a, 0x0000004a, 0x0000004a},
-+ {0x0000b538, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-+ {0x0000b53c, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-+ {0x0000b540, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-+ {0x0000b544, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-+ {0x0000b548, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-+ {0x0000b54c, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-+ {0x0000b550, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-+ {0x0000b554, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-+ {0x0000b558, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-+ {0x0000b55c, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-+ {0x0000b560, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-+ {0x0000b564, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-+ {0x0000b568, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-+ {0x0000b56c, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-+ {0x0000b570, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-+ {0x0000b574, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-+ {0x0000b578, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-+ {0x0000b57c, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-+ {0x00016044, 0x05d6b2db, 0x05d6b2db, 0x05d6b2db, 0x05d6b2db},
-+ {0x00016048, 0x6c924260, 0x6c924260, 0x6c924260, 0x6c924260},
-+};
-+
- static const u32 ar9485Modes_high_ob_db_tx_gain_1_1[][5] = {
- /* Addr 5G_HT20 5G_HT40 2G_HT40 2G_HT20 */
- {0x000098bc, 0x00000002, 0x00000002, 0x00000002, 0x00000002},
-@@ -450,6 +523,79 @@ static const u32 ar9485Modes_low_ob_db_t
-
- #define ar9485_modes_lowest_ob_db_tx_gain_1_1 ar9485Modes_low_ob_db_tx_gain_1_1
-
-+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},
-+ {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d8, 0x000050d8},
-+ {0x0000a458, 0x80000000, 0x80000000, 0x80000000, 0x80000000},
-+ {0x0000a500, 0x00022200, 0x00022200, 0x00000006, 0x00000006},
-+ {0x0000a504, 0x05062002, 0x05062002, 0x03000201, 0x03000201},
-+ {0x0000a508, 0x0c002e00, 0x0c002e00, 0x07000203, 0x07000203},
-+ {0x0000a50c, 0x11062202, 0x11062202, 0x0a000401, 0x0a000401},
-+ {0x0000a510, 0x17022e00, 0x17022e00, 0x0e000403, 0x0e000403},
-+ {0x0000a514, 0x1d000ec2, 0x1d000ec2, 0x12000405, 0x12000405},
-+ {0x0000a518, 0x25020ec0, 0x25020ec0, 0x14000406, 0x14000406},
-+ {0x0000a51c, 0x2b020ec3, 0x2b020ec3, 0x1800040a, 0x1800040a},
-+ {0x0000a520, 0x2f001f04, 0x2f001f04, 0x1c000460, 0x1c000460},
-+ {0x0000a524, 0x35001fc4, 0x35001fc4, 0x22000463, 0x22000463},
-+ {0x0000a528, 0x3c022f04, 0x3c022f04, 0x26000465, 0x26000465},
-+ {0x0000a52c, 0x41023e85, 0x41023e85, 0x2e0006e0, 0x2e0006e0},
-+ {0x0000a530, 0x48023ec6, 0x48023ec6, 0x310006e0, 0x310006e0},
-+ {0x0000a534, 0x4d023f01, 0x4d023f01, 0x330006e0, 0x330006e0},
-+ {0x0000a538, 0x53023f4b, 0x53023f4b, 0x3e0008e3, 0x3e0008e3},
-+ {0x0000a53c, 0x5a027f09, 0x5a027f09, 0x410008e5, 0x410008e5},
-+ {0x0000a540, 0x5f027fc9, 0x5f027fc9, 0x430008e6, 0x430008e6},
-+ {0x0000a544, 0x6502feca, 0x6502feca, 0x4a0008ec, 0x4a0008ec},
-+ {0x0000a548, 0x6b02ff4a, 0x6b02ff4a, 0x4e0008f1, 0x4e0008f1},
-+ {0x0000a54c, 0x7203feca, 0x7203feca, 0x520008f3, 0x520008f3},
-+ {0x0000a550, 0x7703ff0b, 0x7703ff0b, 0x54000eed, 0x54000eed},
-+ {0x0000a554, 0x7d06ffcb, 0x7d06ffcb, 0x58000ef1, 0x58000ef1},
-+ {0x0000a558, 0x8407ff0b, 0x8407ff0b, 0x5c000ef3, 0x5c000ef3},
-+ {0x0000a55c, 0x8907ffcb, 0x8907ffcb, 0x60000ef5, 0x60000ef5},
-+ {0x0000a560, 0x900fff0b, 0x900fff0b, 0x62000ef6, 0x62000ef6},
-+ {0x0000a564, 0x960fffcb, 0x960fffcb, 0x62000ef6, 0x62000ef6},
-+ {0x0000a568, 0x9c1fff0b, 0x9c1fff0b, 0x62000ef6, 0x62000ef6},
-+ {0x0000a56c, 0x9c1fff0b, 0x9c1fff0b, 0x62000ef6, 0x62000ef6},
-+ {0x0000a570, 0x9c1fff0b, 0x9c1fff0b, 0x62000ef6, 0x62000ef6},
-+ {0x0000a574, 0x9c1fff0b, 0x9c1fff0b, 0x62000ef6, 0x62000ef6},
-+ {0x0000a578, 0x9c1fff0b, 0x9c1fff0b, 0x62000ef6, 0x62000ef6},
-+ {0x0000a57c, 0x9c1fff0b, 0x9c1fff0b, 0x62000ef6, 0x62000ef6},
-+ {0x0000b500, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
-+ {0x0000b504, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
-+ {0x0000b508, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
-+ {0x0000b50c, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
-+ {0x0000b510, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
-+ {0x0000b514, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
-+ {0x0000b518, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
-+ {0x0000b51c, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
-+ {0x0000b520, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
-+ {0x0000b524, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
-+ {0x0000b528, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
-+ {0x0000b52c, 0x0000002a, 0x0000002a, 0x0000002a, 0x0000002a},
-+ {0x0000b530, 0x0000003a, 0x0000003a, 0x0000003a, 0x0000003a},
-+ {0x0000b534, 0x0000004a, 0x0000004a, 0x0000004a, 0x0000004a},
-+ {0x0000b538, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-+ {0x0000b53c, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-+ {0x0000b540, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-+ {0x0000b544, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-+ {0x0000b548, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-+ {0x0000b54c, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-+ {0x0000b550, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-+ {0x0000b554, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-+ {0x0000b558, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-+ {0x0000b55c, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-+ {0x0000b560, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-+ {0x0000b564, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-+ {0x0000b568, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-+ {0x0000b56c, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-+ {0x0000b570, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-+ {0x0000b574, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-+ {0x0000b578, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-+ {0x0000b57c, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-+ {0x00016044, 0x05d6b2db, 0x05d6b2db, 0x05d6b2db, 0x05d6b2db},
-+ {0x00016048, 0x6c924260, 0x6c924260, 0x6c924260, 0x6c924260},
-+};
-+
- static const u32 ar9485_1_1[][2] = {
- /* Addr allmodes */
- {0x0000a580, 0x00000000},
---- a/drivers/net/wireless/ath/ath9k/ar9580_1p0_initvals.h
-+++ b/drivers/net/wireless/ath/ath9k/ar9580_1p0_initvals.h
-@@ -685,6 +685,82 @@ static const u32 ar9580_1p0_mixed_ob_db_
-
- #define ar9580_1p0_high_ob_db_tx_gain_table ar9300Modes_high_ob_db_tx_gain_table_2p2
-
-+#define ar9580_1p0_type5_tx_gain_table ar9300Modes_type5_tx_gain_table_2p2
-+
-+static const u32 ar9580_1p0_type6_tx_gain_table[][5] = {
-+ /* Addr 5G_HT20 5G_HT40 2G_HT40 2G_HT20 */
-+ {0x0000a2dc, 0x000cfff0, 0x000cfff0, 0x03aaa352, 0x03aaa352},
-+ {0x0000a2e0, 0x000f0000, 0x000f0000, 0x03ccc584, 0x03ccc584},
-+ {0x0000a2e4, 0x03f00000, 0x03f00000, 0x03f0f800, 0x03f0f800},
-+ {0x0000a2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
-+ {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},
-+ {0x0000a600, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-+ {0x0000a604, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-+ {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, 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, 0x61200001, 0x61200001, 0x66480001, 0x66480001},
-+ {0x00016068, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
-+ {0x00016444, 0x012492d4, 0x012492d4, 0x012492d4, 0x012492d4},
-+ {0x00016448, 0x61200001, 0x61200001, 0x66480001, 0x66480001},
-+ {0x00016468, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
-+ {0x00016844, 0x012492d4, 0x012492d4, 0x012492d4, 0x012492d4},
-+ {0x00016848, 0x61200001, 0x61200001, 0x66480001, 0x66480001},
-+ {0x00016868, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
-+};
-+
- static const u32 ar9580_1p0_soc_preamble[][2] = {
- /* Addr allmodes */
- {0x000040a4, 0x00a0c1c9},
---- a/drivers/net/wireless/ath/ath9k/reg.h
-+++ b/drivers/net/wireless/ath/ath9k/reg.h
-@@ -789,6 +789,7 @@
- #define AR_SREV_REVISION_9271_11 1
- #define AR_SREV_VERSION_9300 0x1c0
- #define AR_SREV_REVISION_9300_20 2 /* 2.0 and 2.1 */
-+#define AR_SREV_REVISION_9300_22 3
- #define AR_SREV_VERSION_9330 0x200
- #define AR_SREV_REVISION_9330_10 0
- #define AR_SREV_REVISION_9330_11 1
-@@ -869,6 +870,9 @@
- (((_ah)->hw_version.macVersion == AR_SREV_VERSION_9300))
- #define AR_SREV_9300_20_OR_LATER(_ah) \
- ((_ah)->hw_version.macVersion >= AR_SREV_VERSION_9300)
-+#define AR_SREV_9300_22(_ah) \
-+ (AR_SREV_9300(ah) && \
-+ ((_ah)->hw_version.macRev == AR_SREV_REVISION_9300_22))
-
- #define AR_SREV_9330(_ah) \
- (((_ah)->hw_version.macVersion == AR_SREV_VERSION_9330))
---- a/net/mac80211/mlme.c
-+++ b/net/mac80211/mlme.c
-@@ -199,11 +199,11 @@ static u32 ieee80211_config_ht_tx(struct
- case NL80211_CHAN_WIDTH_40:
- if (sdata->vif.bss_conf.chandef.chan->center_freq >
- sdata->vif.bss_conf.chandef.center_freq1 &&
-- chan->flags & IEEE80211_CHAN_NO_HT40PLUS)
-+ chan->flags & IEEE80211_CHAN_NO_HT40MINUS)
- disable_40 = true;
- if (sdata->vif.bss_conf.chandef.chan->center_freq <
- sdata->vif.bss_conf.chandef.center_freq1 &&
-- chan->flags & IEEE80211_CHAN_NO_HT40MINUS)
-+ chan->flags & IEEE80211_CHAN_NO_HT40PLUS)
- disable_40 = true;
- break;
- default:
---- a/drivers/net/wireless/ath/ath9k/ar5008_phy.c
-+++ b/drivers/net/wireless/ath/ath9k/ar5008_phy.c
-@@ -485,9 +485,7 @@ static int ar5008_hw_rf_alloc_ext_banks(
- ATH_ALLOC_BANK(ah->analogBank2Data, ah->iniBank2.ia_rows);
- ATH_ALLOC_BANK(ah->analogBank3Data, ah->iniBank3.ia_rows);
- ATH_ALLOC_BANK(ah->analogBank6Data, ah->iniBank6.ia_rows);
-- ATH_ALLOC_BANK(ah->analogBank6TPCData, ah->iniBank6TPC.ia_rows);
- ATH_ALLOC_BANK(ah->analogBank7Data, ah->iniBank7.ia_rows);
-- ATH_ALLOC_BANK(ah->bank6Temp, ah->iniBank6.ia_rows);
-
- return 0;
- #undef ATH_ALLOC_BANK
-@@ -517,6 +515,7 @@ static bool ar5008_hw_set_rf_regs(struct
- u32 ob5GHz = 0, db5GHz = 0;
- u32 ob2GHz = 0, db2GHz = 0;
- int regWrites = 0;
-+ int i;
-
- /*
- * Software does not need to program bank data
-@@ -541,13 +540,9 @@ static bool ar5008_hw_set_rf_regs(struct
- /* Setup Bank 6 Write */
- ar5008_rf_bank_setup(ah->analogBank3Data, &ah->iniBank3,
- modesIndex);
-- {
-- int i;
-- for (i = 0; i < ah->iniBank6TPC.ia_rows; i++) {
-- ah->analogBank6Data[i] =
-- INI_RA(&ah->iniBank6TPC, i, modesIndex);
-- }
-- }
-+
-+ for (i = 0; i < ah->iniBank6.ia_rows; i++)
-+ ah->analogBank6Data[i] = INI_RA(&ah->iniBank6, i, modesIndex);
-
- /* Only the 5 or 2 GHz OB/DB need to be set for a mode */
- if (eepMinorRev >= 2) {
-@@ -572,18 +567,12 @@ static bool ar5008_hw_set_rf_regs(struct
- ar5008_rf_bank_setup(ah->analogBank7Data, &ah->iniBank7, 1);
-
- /* Write Analog registers */
-- REG_WRITE_RF_ARRAY(&ah->iniBank0, ah->analogBank0Data,
-- regWrites);
-- REG_WRITE_RF_ARRAY(&ah->iniBank1, ah->analogBank1Data,
-- regWrites);
-- REG_WRITE_RF_ARRAY(&ah->iniBank2, ah->analogBank2Data,
-- regWrites);
-- REG_WRITE_RF_ARRAY(&ah->iniBank3, ah->analogBank3Data,
-- regWrites);
-- REG_WRITE_RF_ARRAY(&ah->iniBank6TPC, ah->analogBank6Data,
-- regWrites);
-- REG_WRITE_RF_ARRAY(&ah->iniBank7, ah->analogBank7Data,
-- regWrites);
-+ REG_WRITE_RF_ARRAY(&ah->iniBank0, ah->analogBank0Data, regWrites);
-+ REG_WRITE_RF_ARRAY(&ah->iniBank1, ah->analogBank1Data, regWrites);
-+ REG_WRITE_RF_ARRAY(&ah->iniBank2, ah->analogBank2Data, regWrites);
-+ REG_WRITE_RF_ARRAY(&ah->iniBank3, ah->analogBank3Data, regWrites);
-+ REG_WRITE_RF_ARRAY(&ah->iniBank6, ah->analogBank6Data, regWrites);
-+ REG_WRITE_RF_ARRAY(&ah->iniBank7, ah->analogBank7Data, regWrites);
-
- return true;
- }
---- a/drivers/net/wireless/ath/ath9k/ar9002_hw.c
-+++ b/drivers/net/wireless/ath/ath9k/ar9002_hw.c
-@@ -23,13 +23,13 @@
-
- /* General hardware code for the A5008/AR9001/AR9002 hadware families */
-
--static void ar9002_hw_init_mode_regs(struct ath_hw *ah)
-+static int ar9002_hw_init_mode_regs(struct ath_hw *ah)
- {
- if (AR_SREV_9271(ah)) {
- INIT_INI_ARRAY(&ah->iniModes, ar9271Modes_9271);
- INIT_INI_ARRAY(&ah->iniCommon, ar9271Common_9271);
- INIT_INI_ARRAY(&ah->iniModes_9271_ANI_reg, ar9271Modes_9271_ANI_reg);
-- return;
-+ return 0;
- }
-
- if (ah->config.pcie_clock_req)
-@@ -67,12 +67,10 @@ static void ar9002_hw_init_mode_regs(str
- } else if (AR_SREV_9100_OR_LATER(ah)) {
- INIT_INI_ARRAY(&ah->iniModes, ar5416Modes_9100);
- INIT_INI_ARRAY(&ah->iniCommon, ar5416Common_9100);
-- INIT_INI_ARRAY(&ah->iniBank6, ar5416Bank6_9100);
- INIT_INI_ARRAY(&ah->iniAddac, ar5416Addac_9100);
- } else {
- INIT_INI_ARRAY(&ah->iniModes, ar5416Modes);
- INIT_INI_ARRAY(&ah->iniCommon, ar5416Common);
-- INIT_INI_ARRAY(&ah->iniBank6TPC, ar5416Bank6TPC);
- INIT_INI_ARRAY(&ah->iniAddac, ar5416Addac);
- }
-
-@@ -86,14 +84,11 @@ static void ar9002_hw_init_mode_regs(str
- INIT_INI_ARRAY(&ah->iniBank3, ar5416Bank3);
- INIT_INI_ARRAY(&ah->iniBank7, ar5416Bank7);
-
-- /* Common for AR5416, AR9160 */
-- if (!AR_SREV_9100(ah))
-- INIT_INI_ARRAY(&ah->iniBank6, ar5416Bank6);
--
- /* Common for AR913x, AR9160 */
- if (!AR_SREV_5416(ah))
-- INIT_INI_ARRAY(&ah->iniBank6TPC,
-- ar5416Bank6TPC_9100);
-+ INIT_INI_ARRAY(&ah->iniBank6, ar5416Bank6TPC_9100);
-+ else
-+ INIT_INI_ARRAY(&ah->iniBank6, ar5416Bank6TPC);
- }
-
- /* iniAddac needs to be modified for these chips */
-@@ -104,7 +99,7 @@ static void ar9002_hw_init_mode_regs(str
-
- data = devm_kzalloc(ah->dev, size, GFP_KERNEL);
- if (!data)
-- return;
-+ return -ENOMEM;
-
- memcpy(data, addac->ia_array, size);
- addac->ia_array = data;
-@@ -120,6 +115,7 @@ static void ar9002_hw_init_mode_regs(str
- INIT_INI_ARRAY(&ah->iniCckfirJapan2484,
- ar9287Common_japan_2484_cck_fir_coeff_9287_1_1);
- }
-+ return 0;
- }
-
- static void ar9280_20_hw_init_rxgain_ini(struct ath_hw *ah)
-@@ -415,7 +411,10 @@ int ar9002_hw_attach_ops(struct ath_hw *
- struct ath_hw_ops *ops = ath9k_hw_ops(ah);
- int ret;
-
-- priv_ops->init_mode_regs = ar9002_hw_init_mode_regs;
-+ ret = ar9002_hw_init_mode_regs(ah);
-+ if (ret)
-+ return ret;
-+
- priv_ops->init_mode_gain_regs = ar9002_hw_init_mode_gain_regs;
-
- ops->config_pci_powersave = ar9002_hw_configpcipowersave;
---- a/drivers/net/wireless/ath/ath9k/hw.c
-+++ b/drivers/net/wireless/ath/ath9k/hw.c
-@@ -54,11 +54,6 @@ static void ath9k_hw_init_cal_settings(s
- ath9k_hw_private_ops(ah)->init_cal_settings(ah);
- }
-
--static void ath9k_hw_init_mode_regs(struct ath_hw *ah)
--{
-- ath9k_hw_private_ops(ah)->init_mode_regs(ah);
--}
--
- static u32 ath9k_hw_compute_pll_control(struct ath_hw *ah,
- struct ath9k_channel *chan)
- {
-@@ -670,8 +665,6 @@ static int __ath9k_hw_init(struct ath_hw
- if (!AR_SREV_9300_20_OR_LATER(ah))
- ah->ani_function &= ~ATH9K_ANI_MRC_CCK;
-
-- ath9k_hw_init_mode_regs(ah);
--
- if (!ah->is_pciexpress)
- ath9k_hw_disablepcie(ah);
-
---- a/drivers/net/wireless/ath/ath9k/hw.h
-+++ b/drivers/net/wireless/ath/ath9k/hw.h
-@@ -599,7 +599,6 @@ struct ath_hw_radar_conf {
- * @init_cal_settings: setup types of calibrations supported
- * @init_cal: starts actual calibration
- *
-- * @init_mode_regs: Initializes mode registers
- * @init_mode_gain_regs: Initialize TX/RX gain registers
- *
- * @rf_set_freq: change frequency
-@@ -618,7 +617,6 @@ struct ath_hw_private_ops {
- void (*init_cal_settings)(struct ath_hw *ah);
- bool (*init_cal)(struct ath_hw *ah, struct ath9k_channel *chan);