package/mac80211/patches/566-ath9k_deduplicate_initvals.patch

   1 --- a/drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h
   2 +++ b/drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h
   3 @@ -1,5 +1,6 @@
   4  /*
   5   * Copyright (c) 2010-2011 Atheros Communications Inc.
   6 + * Copyright (c) 2011-2012 Qualcomm Atheros Inc.
   7   *
   8   * Permission to use, copy, modify, and/or distribute this software for any
   9   * purpose with or without fee is hereby granted, provided that the above
  10 --- a/drivers/net/wireless/ath/ath9k/ar9330_1p1_initvals.h
  11 +++ b/drivers/net/wireless/ath/ath9k/ar9330_1p1_initvals.h
  12 @@ -337,12 +337,7 @@ static const u32 ar9331_modes_low_ob_db_
  13         {0x00016284, 0x14d3f000, 0x14d3f000, 0x14d3f000, 0x14d3f000},
  14  };
  15
  16 -static const u32 ar9331_1p1_baseband_core_txfir_coeff_japan_2484[][2] = {
  17 -       /* Addr      allmodes  */
  18 -       {0x0000a398, 0x00000000},
  19 -       {0x0000a39c, 0x6f7f0301},
  20 -       {0x0000a3a0, 0xca9228ee},
  21 -};
  22 +#define ar9331_1p1_baseband_core_txfir_coeff_japan_2484 ar9462_2p0_baseband_core_txfir_coeff_japan_2484
  23
  24  static const u32 ar9331_1p1_xtal_25M[][2] = {
  25         /* Addr      allmodes  */
  26 @@ -783,17 +778,7 @@ static const u32 ar9331_modes_high_power
  27         {0x00016284, 0x14d3f000, 0x14d3f000, 0x14d3f000, 0x14d3f000},
  28  };
  29
  30 -static const u32 ar9331_1p1_mac_postamble[][5] = {
  31 -       /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
  32 -       {0x00001030, 0x00000230, 0x00000460, 0x000002c0, 0x00000160},
  33 -       {0x00001070, 0x00000168, 0x000002d0, 0x00000318, 0x0000018c},
  34 -       {0x000010b0, 0x00000e60, 0x00001cc0, 0x00007c70, 0x00003e38},
  35 -       {0x00008014, 0x03e803e8, 0x07d007d0, 0x10801600, 0x08400b00},
  36 -       {0x0000801c, 0x128d8027, 0x128d804f, 0x12e00057, 0x12e0002b},
  37 -       {0x00008120, 0x08f04800, 0x08f04800, 0x08f04810, 0x08f04810},
  38 -       {0x000081d0, 0x00003210, 0x00003210, 0x0000320a, 0x0000320a},
  39 -       {0x00008318, 0x00003e80, 0x00007d00, 0x00006880, 0x00003440},
  40 -};
  41 +#define ar9331_1p1_mac_postamble ar9300_2p2_mac_postamble
  42
  43  static const u32 ar9331_1p1_soc_preamble[][2] = {
  44         /* Addr      allmodes  */
  45 @@ -1112,38 +1097,4 @@ static const u32 ar9331_common_tx_gain_o
  46         {0x00000000},
  47  };
  48
  49 -static const u32 ar9331_1p1_chansel_xtal_25M[] = {
  50 -       0x0101479e,
  51 -       0x0101d027,
  52 -       0x010258af,
  53 -       0x0102e138,
  54 -       0x010369c0,
  55 -       0x0103f249,
  56 -       0x01047ad1,
  57 -       0x0105035a,
  58 -       0x01058be2,
  59 -       0x0106146b,
  60 -       0x01069cf3,
  61 -       0x0107257c,
  62 -       0x0107ae04,
  63 -       0x0108f5b2,
  64 -};
  65 -
  66 -static const u32 ar9331_1p1_chansel_xtal_40M[] = {
  67 -       0x00a0ccbe,
  68 -       0x00a12213,
  69 -       0x00a17769,
  70 -       0x00a1ccbe,
  71 -       0x00a22213,
  72 -       0x00a27769,
  73 -       0x00a2ccbe,
  74 -       0x00a32213,
  75 -       0x00a37769,
  76 -       0x00a3ccbe,
  77 -       0x00a42213,
  78 -       0x00a47769,
  79 -       0x00a4ccbe,
  80 -       0x00a5998b,
  81 -};
  82 -
  83  #endif /* INITVALS_9330_1P1_H */
  84 --- a/drivers/net/wireless/ath/ath9k/ar9330_1p2_initvals.h
  85 +++ b/drivers/net/wireless/ath/ath9k/ar9330_1p2_initvals.h
  86 @@ -1,5 +1,6 @@
  87  /*
  88 - * Copyright (c) 2011 Atheros Communications Inc.
  89 + * Copyright (c) 2010-2011 Atheros Communications Inc.
  90 + * Copyright (c) 2011-2012 Qualcomm Atheros Inc.
  91   *
  92   * Permission to use, copy, modify, and/or distribute this software for any
  93   * purpose with or without fee is hereby granted, provided that the above
  94 @@ -17,8 +18,8 @@
  95  #ifndef INITVALS_9330_1P2_H
  96  #define INITVALS_9330_1P2_H
  97
  98 -static const u32 ar9331_modes_lowest_ob_db_tx_gain_1p2[][5] = {
  99 -       /*  Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20  */
 100 +static const u32 ar9331_modes_high_ob_db_tx_gain_1p2[][5] = {
 101 +       /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
 102         {0x0000a410, 0x000050d7, 0x000050d7, 0x000050d7, 0x000050d7},
 103         {0x0000a500, 0x00022200, 0x00022200, 0x00000000, 0x00000000},
 104         {0x0000a504, 0x05062002, 0x05062002, 0x04000002, 0x04000002},
 105 @@ -102,8 +103,14 @@ static const u32 ar9331_modes_lowest_ob_
 106         {0x0000a63c, 0x04011004, 0x04011004, 0x04011004, 0x04011004},
 107  };
 108
 109 +#define ar9331_modes_high_power_tx_gain_1p2 ar9331_modes_high_ob_db_tx_gain_1p2
 110 +
 111 +#define ar9331_modes_low_ob_db_tx_gain_1p2 ar9331_modes_high_power_tx_gain_1p2
 112 +
 113 +#define ar9331_modes_lowest_ob_db_tx_gain_1p2 ar9331_modes_low_ob_db_tx_gain_1p2
 114 +
 115  static const u32 ar9331_1p2_baseband_postamble[][5] = {
 116 -       /*  Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20  */
 117 +       /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
 118         {0x00009810, 0xd00a8005, 0xd00a8005, 0xd00a8005, 0xd00a8005},
 119         {0x00009820, 0x206a002e, 0x206a002e, 0x206a002e, 0x206a002e},
 120         {0x00009824, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0},
 121 @@ -147,191 +154,6 @@ static const u32 ar9331_1p2_baseband_pos
 122         {0x0000ae18, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
 123  };
 124
 125 -static const u32 ar9331_modes_high_ob_db_tx_gain_1p2[][5] = {
 126 -       /*  Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20  */
 127 -       {0x0000a410, 0x000050d7, 0x000050d7, 0x000050d7, 0x000050d7},
 128 -       {0x0000a500, 0x00022200, 0x00022200, 0x00000000, 0x00000000},
 129 -       {0x0000a504, 0x05062002, 0x05062002, 0x04000002, 0x04000002},
 130 -       {0x0000a508, 0x0c002e00, 0x0c002e00, 0x08000004, 0x08000004},
 131 -       {0x0000a50c, 0x11062202, 0x11062202, 0x0d000200, 0x0d000200},
 132 -       {0x0000a510, 0x17022e00, 0x17022e00, 0x11000202, 0x11000202},
 133 -       {0x0000a514, 0x1d000ec2, 0x1d000ec2, 0x15000400, 0x15000400},
 134 -       {0x0000a518, 0x25020ec0, 0x25020ec0, 0x19000402, 0x19000402},
 135 -       {0x0000a51c, 0x2b020ec3, 0x2b020ec3, 0x1d000404, 0x1d000404},
 136 -       {0x0000a520, 0x2f001f04, 0x2f001f04, 0x23000a00, 0x23000a00},
 137 -       {0x0000a524, 0x35001fc4, 0x35001fc4, 0x27000a02, 0x27000a02},
 138 -       {0x0000a528, 0x3c022f04, 0x3c022f04, 0x2b000a04, 0x2b000a04},
 139 -       {0x0000a52c, 0x41023e85, 0x41023e85, 0x3f001620, 0x3f001620},
 140 -       {0x0000a530, 0x48023ec6, 0x48023ec6, 0x41001621, 0x41001621},
 141 -       {0x0000a534, 0x4d023f01, 0x4d023f01, 0x44001640, 0x44001640},
 142 -       {0x0000a538, 0x53023f4b, 0x53023f4b, 0x46001641, 0x46001641},
 143 -       {0x0000a53c, 0x5a027f09, 0x5a027f09, 0x48001642, 0x48001642},
 144 -       {0x0000a540, 0x5f027fc9, 0x5f027fc9, 0x4b001644, 0x4b001644},
 145 -       {0x0000a544, 0x6502feca, 0x6502feca, 0x4e001a81, 0x4e001a81},
 146 -       {0x0000a548, 0x6b02ff4a, 0x6b02ff4a, 0x51001a83, 0x51001a83},
 147 -       {0x0000a54c, 0x7203feca, 0x7203feca, 0x54001c84, 0x54001c84},
 148 -       {0x0000a550, 0x7703ff0b, 0x7703ff0b, 0x57001ce3, 0x57001ce3},
 149 -       {0x0000a554, 0x7d06ffcb, 0x7d06ffcb, 0x5b001ce5, 0x5b001ce5},
 150 -       {0x0000a558, 0x8407ff0b, 0x8407ff0b, 0x5f001ce9, 0x5f001ce9},
 151 -       {0x0000a55c, 0x8907ffcb, 0x8907ffcb, 0x66001eec, 0x66001eec},
 152 -       {0x0000a560, 0x900fff0b, 0x900fff0b, 0x66001eec, 0x66001eec},
 153 -       {0x0000a564, 0x960fffcb, 0x960fffcb, 0x66001eec, 0x66001eec},
 154 -       {0x0000a568, 0x9c1fff0b, 0x9c1fff0b, 0x66001eec, 0x66001eec},
 155 -       {0x0000a56c, 0x9c1fff0b, 0x9c1fff0b, 0x66001eec, 0x66001eec},
 156 -       {0x0000a570, 0x9c1fff0b, 0x9c1fff0b, 0x66001eec, 0x66001eec},
 157 -       {0x0000a574, 0x9c1fff0b, 0x9c1fff0b, 0x66001eec, 0x66001eec},
 158 -       {0x0000a578, 0x9c1fff0b, 0x9c1fff0b, 0x66001eec, 0x66001eec},
 159 -       {0x0000a57c, 0x9c1fff0b, 0x9c1fff0b, 0x66001eec, 0x66001eec},
 160 -       {0x0000a580, 0x00022200, 0x00022200, 0x00000000, 0x00000000},
 161 -       {0x0000a584, 0x05062002, 0x05062002, 0x04000002, 0x04000002},
 162 -       {0x0000a588, 0x0c002e00, 0x0c002e00, 0x08000004, 0x08000004},
 163 -       {0x0000a58c, 0x11062202, 0x11062202, 0x0b000200, 0x0b000200},
 164 -       {0x0000a590, 0x17022e00, 0x17022e00, 0x0f000202, 0x0f000202},
 165 -       {0x0000a594, 0x1d000ec2, 0x1d000ec2, 0x11000400, 0x11000400},
 166 -       {0x0000a598, 0x25020ec0, 0x25020ec0, 0x15000402, 0x15000402},
 167 -       {0x0000a59c, 0x2b020ec3, 0x2b020ec3, 0x19000404, 0x19000404},
 168 -       {0x0000a5a0, 0x2f001f04, 0x2f001f04, 0x1b000603, 0x1b000603},
 169 -       {0x0000a5a4, 0x35001fc4, 0x35001fc4, 0x1f000a02, 0x1f000a02},
 170 -       {0x0000a5a8, 0x3c022f04, 0x3c022f04, 0x23000a04, 0x23000a04},
 171 -       {0x0000a5ac, 0x41023e85, 0x41023e85, 0x26000a20, 0x26000a20},
 172 -       {0x0000a5b0, 0x48023ec6, 0x48023ec6, 0x2a000e20, 0x2a000e20},
 173 -       {0x0000a5b4, 0x4d023f01, 0x4d023f01, 0x2e000e22, 0x2e000e22},
 174 -       {0x0000a5b8, 0x53023f4b, 0x53023f4b, 0x31000e24, 0x31000e24},
 175 -       {0x0000a5bc, 0x5a027f09, 0x5a027f09, 0x34001640, 0x34001640},
 176 -       {0x0000a5c0, 0x5f027fc9, 0x5f027fc9, 0x38001660, 0x38001660},
 177 -       {0x0000a5c4, 0x6502feca, 0x6502feca, 0x3b001861, 0x3b001861},
 178 -       {0x0000a5c8, 0x6b02ff4a, 0x6b02ff4a, 0x3e001a81, 0x3e001a81},
 179 -       {0x0000a5cc, 0x7203feca, 0x7203feca, 0x42001a83, 0x42001a83},
 180 -       {0x0000a5d0, 0x7703ff0b, 0x7703ff0b, 0x44001c84, 0x44001c84},
 181 -       {0x0000a5d4, 0x7d06ffcb, 0x7d06ffcb, 0x48001ce3, 0x48001ce3},
 182 -       {0x0000a5d8, 0x8407ff0b, 0x8407ff0b, 0x4c001ce5, 0x4c001ce5},
 183 -       {0x0000a5dc, 0x8907ffcb, 0x8907ffcb, 0x50001ce9, 0x50001ce9},
 184 -       {0x0000a5e0, 0x900fff0b, 0x900fff0b, 0x54001ceb, 0x54001ceb},
 185 -       {0x0000a5e4, 0x960fffcb, 0x960fffcb, 0x56001eec, 0x56001eec},
 186 -       {0x0000a5e8, 0x9c1fff0b, 0x9c1fff0b, 0x56001eec, 0x56001eec},
 187 -       {0x0000a5ec, 0x9c1fff0b, 0x9c1fff0b, 0x56001eec, 0x56001eec},
 188 -       {0x0000a5f0, 0x9c1fff0b, 0x9c1fff0b, 0x56001eec, 0x56001eec},
 189 -       {0x0000a5f4, 0x9c1fff0b, 0x9c1fff0b, 0x56001eec, 0x56001eec},
 190 -       {0x0000a5f8, 0x9c1fff0b, 0x9c1fff0b, 0x56001eec, 0x56001eec},
 191 -       {0x0000a5fc, 0x9c1fff0b, 0x9c1fff0b, 0x56001eec, 0x56001eec},
 192 -       {0x0000a600, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
 193 -       {0x0000a604, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
 194 -       {0x0000a608, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
 195 -       {0x0000a60c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
 196 -       {0x0000a610, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
 197 -       {0x0000a614, 0x01404000, 0x01404000, 0x01404000, 0x01404000},
 198 -       {0x0000a618, 0x02008501, 0x02008501, 0x02008501, 0x02008501},
 199 -       {0x0000a61c, 0x02008802, 0x02008802, 0x02008802, 0x02008802},
 200 -       {0x0000a620, 0x0300c802, 0x0300c802, 0x0300c802, 0x0300c802},
 201 -       {0x0000a624, 0x0300cc03, 0x0300cc03, 0x0300cc03, 0x0300cc03},
 202 -       {0x0000a628, 0x04011004, 0x04011004, 0x04011004, 0x04011004},
 203 -       {0x0000a62c, 0x04011004, 0x04011004, 0x04011004, 0x04011004},
 204 -       {0x0000a630, 0x04011004, 0x04011004, 0x04011004, 0x04011004},
 205 -       {0x0000a634, 0x04011004, 0x04011004, 0x04011004, 0x04011004},
 206 -       {0x0000a638, 0x04011004, 0x04011004, 0x04011004, 0x04011004},
 207 -       {0x0000a63c, 0x04011004, 0x04011004, 0x04011004, 0x04011004},
 208 -};
 209 -
 210 -static const u32 ar9331_modes_low_ob_db_tx_gain_1p2[][5] = {
 211 -       /*  Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20  */
 212 -       {0x0000a410, 0x000050d7, 0x000050d7, 0x000050d7, 0x000050d7},
 213 -       {0x0000a500, 0x00022200, 0x00022200, 0x00000000, 0x00000000},
 214 -       {0x0000a504, 0x05062002, 0x05062002, 0x04000002, 0x04000002},
 215 -       {0x0000a508, 0x0c002e00, 0x0c002e00, 0x08000004, 0x08000004},
 216 -       {0x0000a50c, 0x11062202, 0x11062202, 0x0d000200, 0x0d000200},
 217 -       {0x0000a510, 0x17022e00, 0x17022e00, 0x11000202, 0x11000202},
 218 -       {0x0000a514, 0x1d000ec2, 0x1d000ec2, 0x15000400, 0x15000400},
 219 -       {0x0000a518, 0x25020ec0, 0x25020ec0, 0x19000402, 0x19000402},
 220 -       {0x0000a51c, 0x2b020ec3, 0x2b020ec3, 0x1d000404, 0x1d000404},
 221 -       {0x0000a520, 0x2f001f04, 0x2f001f04, 0x23000a00, 0x23000a00},
 222 -       {0x0000a524, 0x35001fc4, 0x35001fc4, 0x27000a02, 0x27000a02},
 223 -       {0x0000a528, 0x3c022f04, 0x3c022f04, 0x2b000a04, 0x2b000a04},
 224 -       {0x0000a52c, 0x41023e85, 0x41023e85, 0x3f001620, 0x3f001620},
 225 -       {0x0000a530, 0x48023ec6, 0x48023ec6, 0x41001621, 0x41001621},
 226 -       {0x0000a534, 0x4d023f01, 0x4d023f01, 0x44001640, 0x44001640},
 227 -       {0x0000a538, 0x53023f4b, 0x53023f4b, 0x46001641, 0x46001641},
 228 -       {0x0000a53c, 0x5a027f09, 0x5a027f09, 0x48001642, 0x48001642},
 229 -       {0x0000a540, 0x5f027fc9, 0x5f027fc9, 0x4b001644, 0x4b001644},
 230 -       {0x0000a544, 0x6502feca, 0x6502feca, 0x4e001a81, 0x4e001a81},
 231 -       {0x0000a548, 0x6b02ff4a, 0x6b02ff4a, 0x51001a83, 0x51001a83},
 232 -       {0x0000a54c, 0x7203feca, 0x7203feca, 0x54001c84, 0x54001c84},
 233 -       {0x0000a550, 0x7703ff0b, 0x7703ff0b, 0x57001ce3, 0x57001ce3},
 234 -       {0x0000a554, 0x7d06ffcb, 0x7d06ffcb, 0x5b001ce5, 0x5b001ce5},
 235 -       {0x0000a558, 0x8407ff0b, 0x8407ff0b, 0x5f001ce9, 0x5f001ce9},
 236 -       {0x0000a55c, 0x8907ffcb, 0x8907ffcb, 0x66001eec, 0x66001eec},
 237 -       {0x0000a560, 0x900fff0b, 0x900fff0b, 0x66001eec, 0x66001eec},
 238 -       {0x0000a564, 0x960fffcb, 0x960fffcb, 0x66001eec, 0x66001eec},
 239 -       {0x0000a568, 0x9c1fff0b, 0x9c1fff0b, 0x66001eec, 0x66001eec},
 240 -       {0x0000a56c, 0x9c1fff0b, 0x9c1fff0b, 0x66001eec, 0x66001eec},
 241 -       {0x0000a570, 0x9c1fff0b, 0x9c1fff0b, 0x66001eec, 0x66001eec},
 242 -       {0x0000a574, 0x9c1fff0b, 0x9c1fff0b, 0x66001eec, 0x66001eec},
 243 -       {0x0000a578, 0x9c1fff0b, 0x9c1fff0b, 0x66001eec, 0x66001eec},
 244 -       {0x0000a57c, 0x9c1fff0b, 0x9c1fff0b, 0x66001eec, 0x66001eec},
 245 -       {0x0000a580, 0x00022200, 0x00022200, 0x00000000, 0x00000000},
 246 -       {0x0000a584, 0x05062002, 0x05062002, 0x04000002, 0x04000002},
 247 -       {0x0000a588, 0x0c002e00, 0x0c002e00, 0x08000004, 0x08000004},
 248 -       {0x0000a58c, 0x11062202, 0x11062202, 0x0b000200, 0x0b000200},
 249 -       {0x0000a590, 0x17022e00, 0x17022e00, 0x0f000202, 0x0f000202},
 250 -       {0x0000a594, 0x1d000ec2, 0x1d000ec2, 0x11000400, 0x11000400},
 251 -       {0x0000a598, 0x25020ec0, 0x25020ec0, 0x15000402, 0x15000402},
 252 -       {0x0000a59c, 0x2b020ec3, 0x2b020ec3, 0x19000404, 0x19000404},
 253 -       {0x0000a5a0, 0x2f001f04, 0x2f001f04, 0x1b000603, 0x1b000603},
 254 -       {0x0000a5a4, 0x35001fc4, 0x35001fc4, 0x1f000a02, 0x1f000a02},
 255 -       {0x0000a5a8, 0x3c022f04, 0x3c022f04, 0x23000a04, 0x23000a04},
 256 -       {0x0000a5ac, 0x41023e85, 0x41023e85, 0x26000a20, 0x26000a20},
 257 -       {0x0000a5b0, 0x48023ec6, 0x48023ec6, 0x2a000e20, 0x2a000e20},
 258 -       {0x0000a5b4, 0x4d023f01, 0x4d023f01, 0x2e000e22, 0x2e000e22},
 259 -       {0x0000a5b8, 0x53023f4b, 0x53023f4b, 0x31000e24, 0x31000e24},
 260 -       {0x0000a5bc, 0x5a027f09, 0x5a027f09, 0x34001640, 0x34001640},
 261 -       {0x0000a5c0, 0x5f027fc9, 0x5f027fc9, 0x38001660, 0x38001660},
 262 -       {0x0000a5c4, 0x6502feca, 0x6502feca, 0x3b001861, 0x3b001861},
 263 -       {0x0000a5c8, 0x6b02ff4a, 0x6b02ff4a, 0x3e001a81, 0x3e001a81},
 264 -       {0x0000a5cc, 0x7203feca, 0x7203feca, 0x42001a83, 0x42001a83},
 265 -       {0x0000a5d0, 0x7703ff0b, 0x7703ff0b, 0x44001c84, 0x44001c84},
 266 -       {0x0000a5d4, 0x7d06ffcb, 0x7d06ffcb, 0x48001ce3, 0x48001ce3},
 267 -       {0x0000a5d8, 0x8407ff0b, 0x8407ff0b, 0x4c001ce5, 0x4c001ce5},
 268 -       {0x0000a5dc, 0x8907ffcb, 0x8907ffcb, 0x50001ce9, 0x50001ce9},
 269 -       {0x0000a5e0, 0x900fff0b, 0x900fff0b, 0x54001ceb, 0x54001ceb},
 270 -       {0x0000a5e4, 0x960fffcb, 0x960fffcb, 0x56001eec, 0x56001eec},
 271 -       {0x0000a5e8, 0x9c1fff0b, 0x9c1fff0b, 0x56001eec, 0x56001eec},
 272 -       {0x0000a5ec, 0x9c1fff0b, 0x9c1fff0b, 0x56001eec, 0x56001eec},
 273 -       {0x0000a5f0, 0x9c1fff0b, 0x9c1fff0b, 0x56001eec, 0x56001eec},
 274 -       {0x0000a5f4, 0x9c1fff0b, 0x9c1fff0b, 0x56001eec, 0x56001eec},
 275 -       {0x0000a5f8, 0x9c1fff0b, 0x9c1fff0b, 0x56001eec, 0x56001eec},
 276 -       {0x0000a5fc, 0x9c1fff0b, 0x9c1fff0b, 0x56001eec, 0x56001eec},
 277 -       {0x0000a600, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
 278 -       {0x0000a604, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
 279 -       {0x0000a608, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
 280 -       {0x0000a60c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
 281 -       {0x0000a610, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
 282 -       {0x0000a614, 0x01404000, 0x01404000, 0x01404000, 0x01404000},
 283 -       {0x0000a618, 0x02008501, 0x02008501, 0x02008501, 0x02008501},
 284 -       {0x0000a61c, 0x02008802, 0x02008802, 0x02008802, 0x02008802},
 285 -       {0x0000a620, 0x0300c802, 0x0300c802, 0x0300c802, 0x0300c802},
 286 -       {0x0000a624, 0x0300cc03, 0x0300cc03, 0x0300cc03, 0x0300cc03},
 287 -       {0x0000a628, 0x04011004, 0x04011004, 0x04011004, 0x04011004},
 288 -       {0x0000a62c, 0x04011004, 0x04011004, 0x04011004, 0x04011004},
 289 -       {0x0000a630, 0x04011004, 0x04011004, 0x04011004, 0x04011004},
 290 -       {0x0000a634, 0x04011004, 0x04011004, 0x04011004, 0x04011004},
 291 -       {0x0000a638, 0x04011004, 0x04011004, 0x04011004, 0x04011004},
 292 -       {0x0000a63c, 0x04011004, 0x04011004, 0x04011004, 0x04011004},
 293 -};
 294 -
 295 -static const u32 ar9331_1p2_baseband_core_txfir_coeff_japan_2484[][2] = {
 296 -       /* Addr      allmodes  */
 297 -       {0x0000a398, 0x00000000},
 298 -       {0x0000a39c, 0x6f7f0301},
 299 -       {0x0000a3a0, 0xca9228ee},
 300 -};
 301 -
 302 -static const u32 ar9331_1p2_xtal_25M[][2] = {
 303 -       /* Addr      allmodes  */
 304 -       {0x00007038, 0x000002f8},
 305 -       {0x00008244, 0x0010f3d7},
 306 -       {0x0000824c, 0x0001e7ae},
 307 -       {0x0001609c, 0x0f508f29},
 308 -};
 309 -
 310  static const u32 ar9331_1p2_radio_core[][2] = {
 311         /* Addr      allmodes  */
 312         {0x00016000, 0x36db6db6},
 313 @@ -397,684 +219,24 @@ static const u32 ar9331_1p2_radio_core[]
 314         {0x000163d4, 0x00000000},
 315  };
 316
 317 -static const u32 ar9331_1p2_soc_postamble[][5] = {
 318 -       /*  Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20  */
 319 -       {0x00007010, 0x00000022, 0x00000022, 0x00000022, 0x00000022},
 320 -};
 321 +#define ar9331_1p2_baseband_core_txfir_coeff_japan_2484 ar9331_1p1_baseband_core_txfir_coeff_japan_2484
 322
 323 -static const u32 ar9331_common_wo_xlna_rx_gain_1p2[][2] = {
 324 -       /* Addr      allmodes  */
 325 -       {0x0000a000, 0x00060005},
 326 -       {0x0000a004, 0x00810080},
 327 -       {0x0000a008, 0x00830082},
 328 -       {0x0000a00c, 0x00850084},
 329 -       {0x0000a010, 0x01820181},
 330 -       {0x0000a014, 0x01840183},
 331 -       {0x0000a018, 0x01880185},
 332 -       {0x0000a01c, 0x018a0189},
 333 -       {0x0000a020, 0x02850284},
 334 -       {0x0000a024, 0x02890288},
 335 -       {0x0000a028, 0x028b028a},
 336 -       {0x0000a02c, 0x03850384},
 337 -       {0x0000a030, 0x03890388},
 338 -       {0x0000a034, 0x038b038a},
 339 -       {0x0000a038, 0x038d038c},
 340 -       {0x0000a03c, 0x03910390},
 341 -       {0x0000a040, 0x03930392},
 342 -       {0x0000a044, 0x03950394},
 343 -       {0x0000a048, 0x00000396},
 344 -       {0x0000a04c, 0x00000000},
 345 -       {0x0000a050, 0x00000000},
 346 -       {0x0000a054, 0x00000000},
 347 -       {0x0000a058, 0x00000000},
 348 -       {0x0000a05c, 0x00000000},
 349 -       {0x0000a060, 0x00000000},
 350 -       {0x0000a064, 0x00000000},
 351 -       {0x0000a068, 0x00000000},
 352 -       {0x0000a06c, 0x00000000},
 353 -       {0x0000a070, 0x00000000},
 354 -       {0x0000a074, 0x00000000},
 355 -       {0x0000a078, 0x00000000},
 356 -       {0x0000a07c, 0x00000000},
 357 -       {0x0000a080, 0x28282828},
 358 -       {0x0000a084, 0x28282828},
 359 -       {0x0000a088, 0x28282828},
 360 -       {0x0000a08c, 0x28282828},
 361 -       {0x0000a090, 0x28282828},
 362 -       {0x0000a094, 0x24242428},
 363 -       {0x0000a098, 0x171e1e1e},
 364 -       {0x0000a09c, 0x02020b0b},
 365 -       {0x0000a0a0, 0x02020202},
 366 -       {0x0000a0a4, 0x00000000},
 367 -       {0x0000a0a8, 0x00000000},
 368 -       {0x0000a0ac, 0x00000000},
 369 -       {0x0000a0b0, 0x00000000},
 370 -       {0x0000a0b4, 0x00000000},
 371 -       {0x0000a0b8, 0x00000000},
 372 -       {0x0000a0bc, 0x00000000},
 373 -       {0x0000a0c0, 0x22072208},
 374 -       {0x0000a0c4, 0x22052206},
 375 -       {0x0000a0c8, 0x22032204},
 376 -       {0x0000a0cc, 0x22012202},
 377 -       {0x0000a0d0, 0x221f2200},
 378 -       {0x0000a0d4, 0x221d221e},
 379 -       {0x0000a0d8, 0x33023303},
 380 -       {0x0000a0dc, 0x33003301},
 381 -       {0x0000a0e0, 0x331e331f},
 382 -       {0x0000a0e4, 0x4402331d},
 383 -       {0x0000a0e8, 0x44004401},
 384 -       {0x0000a0ec, 0x441e441f},
 385 -       {0x0000a0f0, 0x55025503},
 386 -       {0x0000a0f4, 0x55005501},
 387 -       {0x0000a0f8, 0x551e551f},
 388 -       {0x0000a0fc, 0x6602551d},
 389 -       {0x0000a100, 0x66006601},
 390 -       {0x0000a104, 0x661e661f},
 391 -       {0x0000a108, 0x7703661d},
 392 -       {0x0000a10c, 0x77017702},
 393 -       {0x0000a110, 0x00007700},
 394 -       {0x0000a114, 0x00000000},
 395 -       {0x0000a118, 0x00000000},
 396 -       {0x0000a11c, 0x00000000},
 397 -       {0x0000a120, 0x00000000},
 398 -       {0x0000a124, 0x00000000},
 399 -       {0x0000a128, 0x00000000},
 400 -       {0x0000a12c, 0x00000000},
 401 -       {0x0000a130, 0x00000000},
 402 -       {0x0000a134, 0x00000000},
 403 -       {0x0000a138, 0x00000000},
 404 -       {0x0000a13c, 0x00000000},
 405 -       {0x0000a140, 0x001f0000},
 406 -       {0x0000a144, 0x111f1100},
 407 -       {0x0000a148, 0x111d111e},
 408 -       {0x0000a14c, 0x111b111c},
 409 -       {0x0000a150, 0x22032204},
 410 -       {0x0000a154, 0x22012202},
 411 -       {0x0000a158, 0x221f2200},
 412 -       {0x0000a15c, 0x221d221e},
 413 -       {0x0000a160, 0x33013302},
 414 -       {0x0000a164, 0x331f3300},
 415 -       {0x0000a168, 0x4402331e},
 416 -       {0x0000a16c, 0x44004401},
 417 -       {0x0000a170, 0x441e441f},
 418 -       {0x0000a174, 0x55015502},
 419 -       {0x0000a178, 0x551f5500},
 420 -       {0x0000a17c, 0x6602551e},
 421 -       {0x0000a180, 0x66006601},
 422 -       {0x0000a184, 0x661e661f},
 423 -       {0x0000a188, 0x7703661d},
 424 -       {0x0000a18c, 0x77017702},
 425 -       {0x0000a190, 0x00007700},
 426 -       {0x0000a194, 0x00000000},
 427 -       {0x0000a198, 0x00000000},
 428 -       {0x0000a19c, 0x00000000},
 429 -       {0x0000a1a0, 0x00000000},
 430 -       {0x0000a1a4, 0x00000000},
 431 -       {0x0000a1a8, 0x00000000},
 432 -       {0x0000a1ac, 0x00000000},
 433 -       {0x0000a1b0, 0x00000000},
 434 -       {0x0000a1b4, 0x00000000},
 435 -       {0x0000a1b8, 0x00000000},
 436 -       {0x0000a1bc, 0x00000000},
 437 -       {0x0000a1c0, 0x00000000},
 438 -       {0x0000a1c4, 0x00000000},
 439 -       {0x0000a1c8, 0x00000000},
 440 -       {0x0000a1cc, 0x00000000},
 441 -       {0x0000a1d0, 0x00000000},
 442 -       {0x0000a1d4, 0x00000000},
 443 -       {0x0000a1d8, 0x00000000},
 444 -       {0x0000a1dc, 0x00000000},
 445 -       {0x0000a1e0, 0x00000000},
 446 -       {0x0000a1e4, 0x00000000},
 447 -       {0x0000a1e8, 0x00000000},
 448 -       {0x0000a1ec, 0x00000000},
 449 -       {0x0000a1f0, 0x00000396},
 450 -       {0x0000a1f4, 0x00000396},
 451 -       {0x0000a1f8, 0x00000396},
 452 -       {0x0000a1fc, 0x00000296},
 453 -};
 454 +#define ar9331_1p2_xtal_25M ar9331_1p1_xtal_25M
 455
 456 -static const u32 ar9331_1p2_baseband_core[][2] = {
 457 -       /* Addr      allmodes  */
 458 -       {0x00009800, 0xafe68e30},
 459 -       {0x00009804, 0xfd14e000},
 460 -       {0x00009808, 0x9c0a8f6b},
 461 -       {0x0000980c, 0x04800000},
 462 -       {0x00009814, 0x9280c00a},
 463 -       {0x00009818, 0x00000000},
 464 -       {0x0000981c, 0x00020028},
 465 -       {0x00009834, 0x5f3ca3de},
 466 -       {0x00009838, 0x0108ecff},
 467 -       {0x0000983c, 0x14750600},
 468 -       {0x00009880, 0x201fff00},
 469 -       {0x00009884, 0x00001042},
 470 -       {0x000098a4, 0x00200400},
 471 -       {0x000098b0, 0x32840bbe},
 472 -       {0x000098d0, 0x004b6a8e},
 473 -       {0x000098d4, 0x00000820},
 474 -       {0x000098dc, 0x00000000},
 475 -       {0x000098f0, 0x00000000},
 476 -       {0x000098f4, 0x00000000},
 477 -       {0x00009c04, 0x00000000},
 478 -       {0x00009c08, 0x03200000},
 479 -       {0x00009c0c, 0x00000000},
 480 -       {0x00009c10, 0x00000000},
 481 -       {0x00009c14, 0x00046384},
 482 -       {0x00009c18, 0x05b6b440},
 483 -       {0x00009c1c, 0x00b6b440},
 484 -       {0x00009d00, 0xc080a333},
 485 -       {0x00009d04, 0x40206c10},
 486 -       {0x00009d08, 0x009c4060},
 487 -       {0x00009d0c, 0x1883800a},
 488 -       {0x00009d10, 0x01834061},
 489 -       {0x00009d14, 0x00c00400},
 490 -       {0x00009d18, 0x00000000},
 491 -       {0x00009e08, 0x0038233c},
 492 -       {0x00009e24, 0x9927b515},
 493 -       {0x00009e28, 0x12ef0200},
 494 -       {0x00009e30, 0x06336f77},
 495 -       {0x00009e34, 0x6af6532f},
 496 -       {0x00009e38, 0x0cc80c00},
 497 -       {0x00009e40, 0x0d261820},
 498 -       {0x00009e4c, 0x00001004},
 499 -       {0x00009e50, 0x00ff03f1},
 500 -       {0x00009fc0, 0x803e4788},
 501 -       {0x00009fc4, 0x0001efb5},
 502 -       {0x00009fcc, 0x40000014},
 503 -       {0x0000a20c, 0x00000000},
 504 -       {0x0000a220, 0x00000000},
 505 -       {0x0000a224, 0x00000000},
 506 -       {0x0000a228, 0x10002310},
 507 -       {0x0000a23c, 0x00000000},
 508 -       {0x0000a244, 0x0c000000},
 509 -       {0x0000a2a0, 0x00000001},
 510 -       {0x0000a2c0, 0x00000001},
 511 -       {0x0000a2c8, 0x00000000},
 512 -       {0x0000a2cc, 0x18c43433},
 513 -       {0x0000a2d4, 0x00000000},
 514 -       {0x0000a2dc, 0x00000000},
 515 -       {0x0000a2e0, 0x00000000},
 516 -       {0x0000a2e4, 0x00000000},
 517 -       {0x0000a2e8, 0x00000000},
 518 -       {0x0000a2ec, 0x00000000},
 519 -       {0x0000a2f0, 0x00000000},
 520 -       {0x0000a2f4, 0x00000000},
 521 -       {0x0000a2f8, 0x00000000},
 522 -       {0x0000a344, 0x00000000},
 523 -       {0x0000a34c, 0x00000000},
 524 -       {0x0000a350, 0x0000a000},
 525 -       {0x0000a364, 0x00000000},
 526 -       {0x0000a370, 0x00000000},
 527 -       {0x0000a390, 0x00000001},
 528 -       {0x0000a394, 0x00000444},
 529 -       {0x0000a398, 0x001f0e0f},
 530 -       {0x0000a39c, 0x0075393f},
 531 -       {0x0000a3a0, 0xb79f6427},
 532 -       {0x0000a3a4, 0x00000000},
 533 -       {0x0000a3a8, 0xaaaaaaaa},
 534 -       {0x0000a3ac, 0x3c466478},
 535 -       {0x0000a3c0, 0x20202020},
 536 -       {0x0000a3c4, 0x22222220},
 537 -       {0x0000a3c8, 0x20200020},
 538 -       {0x0000a3cc, 0x20202020},
 539 -       {0x0000a3d0, 0x20202020},
 540 -       {0x0000a3d4, 0x20202020},
 541 -       {0x0000a3d8, 0x20202020},
 542 -       {0x0000a3dc, 0x20202020},
 543 -       {0x0000a3e0, 0x20202020},
 544 -       {0x0000a3e4, 0x20202020},
 545 -       {0x0000a3e8, 0x20202020},
 546 -       {0x0000a3ec, 0x20202020},
 547 -       {0x0000a3f0, 0x00000000},
 548 -       {0x0000a3f4, 0x00000006},
 549 -       {0x0000a3f8, 0x0cdbd380},
 550 -       {0x0000a3fc, 0x000f0f01},
 551 -       {0x0000a400, 0x8fa91f01},
 552 -       {0x0000a404, 0x00000000},
 553 -       {0x0000a408, 0x0e79e5c6},
 554 -       {0x0000a40c, 0x00820820},
 555 -       {0x0000a414, 0x1ce739ce},
 556 -       {0x0000a418, 0x2d001dce},
 557 -       {0x0000a41c, 0x1ce739ce},
 558 -       {0x0000a420, 0x000001ce},
 559 -       {0x0000a424, 0x1ce739ce},
 560 -       {0x0000a428, 0x000001ce},
 561 -       {0x0000a42c, 0x1ce739ce},
 562 -       {0x0000a430, 0x1ce739ce},
 563 -       {0x0000a434, 0x00000000},
 564 -       {0x0000a438, 0x00001801},
 565 -       {0x0000a43c, 0x00000000},
 566 -       {0x0000a440, 0x00000000},
 567 -       {0x0000a444, 0x00000000},
 568 -       {0x0000a448, 0x04000000},
 569 -       {0x0000a44c, 0x00000001},
 570 -       {0x0000a450, 0x00010000},
 571 -       {0x0000a458, 0x00000000},
 572 -       {0x0000a640, 0x00000000},
 573 -       {0x0000a644, 0x3fad9d74},
 574 -       {0x0000a648, 0x0048060a},
 575 -       {0x0000a64c, 0x00003c37},
 576 -       {0x0000a670, 0x03020100},
 577 -       {0x0000a674, 0x09080504},
 578 -       {0x0000a678, 0x0d0c0b0a},
 579 -       {0x0000a67c, 0x13121110},
 580 -       {0x0000a680, 0x31301514},
 581 -       {0x0000a684, 0x35343332},
 582 -       {0x0000a688, 0x00000036},
 583 -       {0x0000a690, 0x00000838},
 584 -       {0x0000a7c0, 0x00000000},
 585 -       {0x0000a7c4, 0xfffffffc},
 586 -       {0x0000a7c8, 0x00000000},
 587 -       {0x0000a7cc, 0x00000000},
 588 -       {0x0000a7d0, 0x00000000},
 589 -       {0x0000a7d4, 0x00000004},
 590 -       {0x0000a7dc, 0x00000001},
 591 -};
 592 +#define ar9331_1p2_xtal_40M ar9331_1p1_xtal_40M
 593
 594 -static const u32 ar9331_modes_high_power_tx_gain_1p2[][5] = {
 595 -       /*  Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20  */
 596 -       {0x0000a410, 0x000050d7, 0x000050d7, 0x000050d7, 0x000050d7},
 597 -       {0x0000a500, 0x00022200, 0x00022200, 0x00000000, 0x00000000},
 598 -       {0x0000a504, 0x05062002, 0x05062002, 0x04000002, 0x04000002},
 599 -       {0x0000a508, 0x0c002e00, 0x0c002e00, 0x08000004, 0x08000004},
 600 -       {0x0000a50c, 0x11062202, 0x11062202, 0x0d000200, 0x0d000200},
 601 -       {0x0000a510, 0x17022e00, 0x17022e00, 0x11000202, 0x11000202},
 602 -       {0x0000a514, 0x1d000ec2, 0x1d000ec2, 0x15000400, 0x15000400},
 603 -       {0x0000a518, 0x25020ec0, 0x25020ec0, 0x19000402, 0x19000402},
 604 -       {0x0000a51c, 0x2b020ec3, 0x2b020ec3, 0x1d000404, 0x1d000404},
 605 -       {0x0000a520, 0x2f001f04, 0x2f001f04, 0x23000a00, 0x23000a00},
 606 -       {0x0000a524, 0x35001fc4, 0x35001fc4, 0x27000a02, 0x27000a02},
 607 -       {0x0000a528, 0x3c022f04, 0x3c022f04, 0x2b000a04, 0x2b000a04},
 608 -       {0x0000a52c, 0x41023e85, 0x41023e85, 0x3f001620, 0x3f001620},
 609 -       {0x0000a530, 0x48023ec6, 0x48023ec6, 0x41001621, 0x41001621},
 610 -       {0x0000a534, 0x4d023f01, 0x4d023f01, 0x44001640, 0x44001640},
 611 -       {0x0000a538, 0x53023f4b, 0x53023f4b, 0x46001641, 0x46001641},
 612 -       {0x0000a53c, 0x5a027f09, 0x5a027f09, 0x48001642, 0x48001642},
 613 -       {0x0000a540, 0x5f027fc9, 0x5f027fc9, 0x4b001644, 0x4b001644},
 614 -       {0x0000a544, 0x6502feca, 0x6502feca, 0x4e001a81, 0x4e001a81},
 615 -       {0x0000a548, 0x6b02ff4a, 0x6b02ff4a, 0x51001a83, 0x51001a83},
 616 -       {0x0000a54c, 0x7203feca, 0x7203feca, 0x54001c84, 0x54001c84},
 617 -       {0x0000a550, 0x7703ff0b, 0x7703ff0b, 0x57001ce3, 0x57001ce3},
 618 -       {0x0000a554, 0x7d06ffcb, 0x7d06ffcb, 0x5b001ce5, 0x5b001ce5},
 619 -       {0x0000a558, 0x8407ff0b, 0x8407ff0b, 0x5f001ce9, 0x5f001ce9},
 620 -       {0x0000a55c, 0x8907ffcb, 0x8907ffcb, 0x66001eec, 0x66001eec},
 621 -       {0x0000a560, 0x900fff0b, 0x900fff0b, 0x66001eec, 0x66001eec},
 622 -       {0x0000a564, 0x960fffcb, 0x960fffcb, 0x66001eec, 0x66001eec},
 623 -       {0x0000a568, 0x9c1fff0b, 0x9c1fff0b, 0x66001eec, 0x66001eec},
 624 -       {0x0000a56c, 0x9c1fff0b, 0x9c1fff0b, 0x66001eec, 0x66001eec},
 625 -       {0x0000a570, 0x9c1fff0b, 0x9c1fff0b, 0x66001eec, 0x66001eec},
 626 -       {0x0000a574, 0x9c1fff0b, 0x9c1fff0b, 0x66001eec, 0x66001eec},
 627 -       {0x0000a578, 0x9c1fff0b, 0x9c1fff0b, 0x66001eec, 0x66001eec},
 628 -       {0x0000a57c, 0x9c1fff0b, 0x9c1fff0b, 0x66001eec, 0x66001eec},
 629 -       {0x0000a580, 0x00022200, 0x00022200, 0x00000000, 0x00000000},
 630 -       {0x0000a584, 0x05062002, 0x05062002, 0x04000002, 0x04000002},
 631 -       {0x0000a588, 0x0c002e00, 0x0c002e00, 0x08000004, 0x08000004},
 632 -       {0x0000a58c, 0x11062202, 0x11062202, 0x0b000200, 0x0b000200},
 633 -       {0x0000a590, 0x17022e00, 0x17022e00, 0x0f000202, 0x0f000202},
 634 -       {0x0000a594, 0x1d000ec2, 0x1d000ec2, 0x11000400, 0x11000400},
 635 -       {0x0000a598, 0x25020ec0, 0x25020ec0, 0x15000402, 0x15000402},
 636 -       {0x0000a59c, 0x2b020ec3, 0x2b020ec3, 0x19000404, 0x19000404},
 637 -       {0x0000a5a0, 0x2f001f04, 0x2f001f04, 0x1b000603, 0x1b000603},
 638 -       {0x0000a5a4, 0x35001fc4, 0x35001fc4, 0x1f000a02, 0x1f000a02},
 639 -       {0x0000a5a8, 0x3c022f04, 0x3c022f04, 0x23000a04, 0x23000a04},
 640 -       {0x0000a5ac, 0x41023e85, 0x41023e85, 0x26000a20, 0x26000a20},
 641 -       {0x0000a5b0, 0x48023ec6, 0x48023ec6, 0x2a000e20, 0x2a000e20},
 642 -       {0x0000a5b4, 0x4d023f01, 0x4d023f01, 0x2e000e22, 0x2e000e22},
 643 -       {0x0000a5b8, 0x53023f4b, 0x53023f4b, 0x31000e24, 0x31000e24},
 644 -       {0x0000a5bc, 0x5a027f09, 0x5a027f09, 0x34001640, 0x34001640},
 645 -       {0x0000a5c0, 0x5f027fc9, 0x5f027fc9, 0x38001660, 0x38001660},
 646 -       {0x0000a5c4, 0x6502feca, 0x6502feca, 0x3b001861, 0x3b001861},
 647 -       {0x0000a5c8, 0x6b02ff4a, 0x6b02ff4a, 0x3e001a81, 0x3e001a81},
 648 -       {0x0000a5cc, 0x7203feca, 0x7203feca, 0x42001a83, 0x42001a83},
 649 -       {0x0000a5d0, 0x7703ff0b, 0x7703ff0b, 0x44001c84, 0x44001c84},
 650 -       {0x0000a5d4, 0x7d06ffcb, 0x7d06ffcb, 0x48001ce3, 0x48001ce3},
 651 -       {0x0000a5d8, 0x8407ff0b, 0x8407ff0b, 0x4c001ce5, 0x4c001ce5},
 652 -       {0x0000a5dc, 0x8907ffcb, 0x8907ffcb, 0x50001ce9, 0x50001ce9},
 653 -       {0x0000a5e0, 0x900fff0b, 0x900fff0b, 0x54001ceb, 0x54001ceb},
 654 -       {0x0000a5e4, 0x960fffcb, 0x960fffcb, 0x56001eec, 0x56001eec},
 655 -       {0x0000a5e8, 0x9c1fff0b, 0x9c1fff0b, 0x56001eec, 0x56001eec},
 656 -       {0x0000a5ec, 0x9c1fff0b, 0x9c1fff0b, 0x56001eec, 0x56001eec},
 657 -       {0x0000a5f0, 0x9c1fff0b, 0x9c1fff0b, 0x56001eec, 0x56001eec},
 658 -       {0x0000a5f4, 0x9c1fff0b, 0x9c1fff0b, 0x56001eec, 0x56001eec},
 659 -       {0x0000a5f8, 0x9c1fff0b, 0x9c1fff0b, 0x56001eec, 0x56001eec},
 660 -       {0x0000a5fc, 0x9c1fff0b, 0x9c1fff0b, 0x56001eec, 0x56001eec},
 661 -       {0x0000a600, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
 662 -       {0x0000a604, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
 663 -       {0x0000a608, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
 664 -       {0x0000a60c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
 665 -       {0x0000a610, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
 666 -       {0x0000a614, 0x01404000, 0x01404000, 0x01404000, 0x01404000},
 667 -       {0x0000a618, 0x02008501, 0x02008501, 0x02008501, 0x02008501},
 668 -       {0x0000a61c, 0x02008802, 0x02008802, 0x02008802, 0x02008802},
 669 -       {0x0000a620, 0x0300c802, 0x0300c802, 0x0300c802, 0x0300c802},
 670 -       {0x0000a624, 0x0300cc03, 0x0300cc03, 0x0300cc03, 0x0300cc03},
 671 -       {0x0000a628, 0x04011004, 0x04011004, 0x04011004, 0x04011004},
 672 -       {0x0000a62c, 0x04011004, 0x04011004, 0x04011004, 0x04011004},
 673 -       {0x0000a630, 0x04011004, 0x04011004, 0x04011004, 0x04011004},
 674 -       {0x0000a634, 0x04011004, 0x04011004, 0x04011004, 0x04011004},
 675 -       {0x0000a638, 0x04011004, 0x04011004, 0x04011004, 0x04011004},
 676 -       {0x0000a63c, 0x04011004, 0x04011004, 0x04011004, 0x04011004},
 677 -};
 678 +#define ar9331_1p2_baseband_core ar9331_1p1_baseband_core
 679
 680 -static const u32 ar9331_1p2_mac_postamble[][5] = {
 681 -       /*  Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20  */
 682 -       {0x00001030, 0x00000230, 0x00000460, 0x000002c0, 0x00000160},
 683 -       {0x00001070, 0x00000168, 0x000002d0, 0x00000318, 0x0000018c},
 684 -       {0x000010b0, 0x00000e60, 0x00001cc0, 0x00007c70, 0x00003e38},
 685 -       {0x00008014, 0x03e803e8, 0x07d007d0, 0x10801600, 0x08400b00},
 686 -       {0x0000801c, 0x128d8027, 0x128d804f, 0x12e00057, 0x12e0002b},
 687 -       {0x00008120, 0x08f04800, 0x08f04800, 0x08f04810, 0x08f04810},
 688 -       {0x000081d0, 0x00003210, 0x00003210, 0x0000320a, 0x0000320a},
 689 -       {0x00008318, 0x00003e80, 0x00007d00, 0x00006880, 0x00003440},
 690 -};
 691 +#define ar9331_1p2_soc_postamble ar9331_1p1_soc_postamble
 692
 693 -static const u32 ar9331_1p2_soc_preamble[][2] = {
 694 -       /* Addr      allmodes  */
 695 -       {0x00007020, 0x00000000},
 696 -       {0x00007034, 0x00000002},
 697 -       {0x00007038, 0x000002f8},
 698 -};
 699 +#define ar9331_1p2_mac_postamble ar9331_1p1_mac_postamble
 700
 701 -static const u32 ar9331_1p2_xtal_40M[][2] = {
 702 -       /* Addr      allmodes  */
 703 -       {0x00007038, 0x000004c2},
 704 -       {0x00008244, 0x0010f400},
 705 -       {0x0000824c, 0x0001e800},
 706 -       {0x0001609c, 0x0b283f31},
 707 -};
 708 +#define ar9331_1p2_soc_preamble ar9331_1p1_soc_preamble
 709
 710 -static const u32 ar9331_1p2_mac_core[][2] = {
 711 -       /* Addr      allmodes  */
 712 -       {0x00000008, 0x00000000},
 713 -       {0x00000030, 0x00020085},
 714 -       {0x00000034, 0x00000005},
 715 -       {0x00000040, 0x00000000},
 716 -       {0x00000044, 0x00000000},
 717 -       {0x00000048, 0x00000008},
 718 -       {0x0000004c, 0x00000010},
 719 -       {0x00000050, 0x00000000},
 720 -       {0x00001040, 0x002ffc0f},
 721 -       {0x00001044, 0x002ffc0f},
 722 -       {0x00001048, 0x002ffc0f},
 723 -       {0x0000104c, 0x002ffc0f},
 724 -       {0x00001050, 0x002ffc0f},
 725 -       {0x00001054, 0x002ffc0f},
 726 -       {0x00001058, 0x002ffc0f},
 727 -       {0x0000105c, 0x002ffc0f},
 728 -       {0x00001060, 0x002ffc0f},
 729 -       {0x00001064, 0x002ffc0f},
 730 -       {0x000010f0, 0x00000100},
 731 -       {0x00001270, 0x00000000},
 732 -       {0x000012b0, 0x00000000},
 733 -       {0x000012f0, 0x00000000},
 734 -       {0x0000143c, 0x00000000},
 735 -       {0x0000147c, 0x00000000},
 736 -       {0x00008000, 0x00000000},
 737 -       {0x00008004, 0x00000000},
 738 -       {0x00008008, 0x00000000},
 739 -       {0x0000800c, 0x00000000},
 740 -       {0x00008018, 0x00000000},
 741 -       {0x00008020, 0x00000000},
 742 -       {0x00008038, 0x00000000},
 743 -       {0x0000803c, 0x00000000},
 744 -       {0x00008040, 0x00000000},
 745 -       {0x00008044, 0x00000000},
 746 -       {0x00008048, 0x00000000},
 747 -       {0x0000804c, 0xffffffff},
 748 -       {0x00008054, 0x00000000},
 749 -       {0x00008058, 0x00000000},
 750 -       {0x0000805c, 0x000fc78f},
 751 -       {0x00008060, 0x0000000f},
 752 -       {0x00008064, 0x00000000},
 753 -       {0x00008070, 0x00000310},
 754 -       {0x00008074, 0x00000020},
 755 -       {0x00008078, 0x00000000},
 756 -       {0x0000809c, 0x0000000f},
 757 -       {0x000080a0, 0x00000000},
 758 -       {0x000080a4, 0x02ff0000},
 759 -       {0x000080a8, 0x0e070605},
 760 -       {0x000080ac, 0x0000000d},
 761 -       {0x000080b0, 0x00000000},
 762 -       {0x000080b4, 0x00000000},
 763 -       {0x000080b8, 0x00000000},
 764 -       {0x000080bc, 0x00000000},
 765 -       {0x000080c0, 0x2a800000},
 766 -       {0x000080c4, 0x06900168},
 767 -       {0x000080c8, 0x13881c20},
 768 -       {0x000080cc, 0x01f40000},
 769 -       {0x000080d0, 0x00252500},
 770 -       {0x000080d4, 0x00a00000},
 771 -       {0x000080d8, 0x00400000},
 772 -       {0x000080dc, 0x00000000},
 773 -       {0x000080e0, 0xffffffff},
 774 -       {0x000080e4, 0x0000ffff},
 775 -       {0x000080e8, 0x3f3f3f3f},
 776 -       {0x000080ec, 0x00000000},
 777 -       {0x000080f0, 0x00000000},
 778 -       {0x000080f4, 0x00000000},
 779 -       {0x000080fc, 0x00020000},
 780 -       {0x00008100, 0x00000000},
 781 -       {0x00008108, 0x00000052},
 782 -       {0x0000810c, 0x00000000},
 783 -       {0x00008110, 0x00000000},
 784 -       {0x00008114, 0x000007ff},
 785 -       {0x00008118, 0x000000aa},
 786 -       {0x0000811c, 0x00003210},
 787 -       {0x00008124, 0x00000000},
 788 -       {0x00008128, 0x00000000},
 789 -       {0x0000812c, 0x00000000},
 790 -       {0x00008130, 0x00000000},
 791 -       {0x00008134, 0x00000000},
 792 -       {0x00008138, 0x00000000},
 793 -       {0x0000813c, 0x0000ffff},
 794 -       {0x00008144, 0xffffffff},
 795 -       {0x00008168, 0x00000000},
 796 -       {0x0000816c, 0x00000000},
 797 -       {0x00008170, 0x18486200},
 798 -       {0x00008174, 0x33332210},
 799 -       {0x00008178, 0x00000000},
 800 -       {0x0000817c, 0x00020000},
 801 -       {0x000081c0, 0x00000000},
 802 -       {0x000081c4, 0x33332210},
 803 -       {0x000081c8, 0x00000000},
 804 -       {0x000081cc, 0x00000000},
 805 -       {0x000081d4, 0x00000000},
 806 -       {0x000081ec, 0x00000000},
 807 -       {0x000081f0, 0x00000000},
 808 -       {0x000081f4, 0x00000000},
 809 -       {0x000081f8, 0x00000000},
 810 -       {0x000081fc, 0x00000000},
 811 -       {0x00008240, 0x00100000},
 812 -       {0x00008248, 0x00000800},
 813 -       {0x00008250, 0x00000000},
 814 -       {0x00008254, 0x00000000},
 815 -       {0x00008258, 0x00000000},
 816 -       {0x0000825c, 0x40000000},
 817 -       {0x00008260, 0x00080922},
 818 -       {0x00008264, 0x9d400010},
 819 -       {0x00008268, 0xffffffff},
 820 -       {0x0000826c, 0x0000ffff},
 821 -       {0x00008270, 0x00000000},
 822 -       {0x00008274, 0x40000000},
 823 -       {0x00008278, 0x003e4180},
 824 -       {0x0000827c, 0x00000004},
 825 -       {0x00008284, 0x0000002c},
 826 -       {0x00008288, 0x0000002c},
 827 -       {0x0000828c, 0x000000ff},
 828 -       {0x00008294, 0x00000000},
 829 -       {0x00008298, 0x00000000},
 830 -       {0x0000829c, 0x00000000},
 831 -       {0x00008300, 0x00000140},
 832 -       {0x00008314, 0x00000000},
 833 -       {0x0000831c, 0x0000010d},
 834 -       {0x00008328, 0x00000000},
 835 -       {0x0000832c, 0x00000007},
 836 -       {0x00008330, 0x00000302},
 837 -       {0x00008334, 0x00000700},
 838 -       {0x00008338, 0x00ff0000},
 839 -       {0x0000833c, 0x02400000},
 840 -       {0x00008340, 0x000107ff},
 841 -       {0x00008344, 0xaa48105b},
 842 -       {0x00008348, 0x008f0000},
 843 -       {0x0000835c, 0x00000000},
 844 -       {0x00008360, 0xffffffff},
 845 -       {0x00008364, 0xffffffff},
 846 -       {0x00008368, 0x00000000},
 847 -       {0x00008370, 0x00000000},
 848 -       {0x00008374, 0x000000ff},
 849 -       {0x00008378, 0x00000000},
 850 -       {0x0000837c, 0x00000000},
 851 -       {0x00008380, 0xffffffff},
 852 -       {0x00008384, 0xffffffff},
 853 -       {0x00008390, 0xffffffff},
 854 -       {0x00008394, 0xffffffff},
 855 -       {0x00008398, 0x00000000},
 856 -       {0x0000839c, 0x00000000},
 857 -       {0x000083a0, 0x00000000},
 858 -       {0x000083a4, 0x0000fa14},
 859 -       {0x000083a8, 0x000f0c00},
 860 -       {0x000083ac, 0x33332210},
 861 -       {0x000083b0, 0x33332210},
 862 -       {0x000083b4, 0x33332210},
 863 -       {0x000083b8, 0x33332210},
 864 -       {0x000083bc, 0x00000000},
 865 -       {0x000083c0, 0x00000000},
 866 -       {0x000083c4, 0x00000000},
 867 -       {0x000083c8, 0x00000000},
 868 -       {0x000083cc, 0x00000200},
 869 -       {0x000083d0, 0x000301ff},
 870 -};
 871 +#define ar9331_1p2_mac_core ar9331_1p1_mac_core
 872
 873 -static const u32 ar9331_common_rx_gain_1p2[][2] = {
 874 -       /* Addr      allmodes  */
 875 -       {0x0000a000, 0x00010000},
 876 -       {0x0000a004, 0x00030002},
 877 -       {0x0000a008, 0x00050004},
 878 -       {0x0000a00c, 0x00810080},
 879 -       {0x0000a010, 0x01800082},
 880 -       {0x0000a014, 0x01820181},
 881 -       {0x0000a018, 0x01840183},
 882 -       {0x0000a01c, 0x01880185},
 883 -       {0x0000a020, 0x018a0189},
 884 -       {0x0000a024, 0x02850284},
 885 -       {0x0000a028, 0x02890288},
 886 -       {0x0000a02c, 0x03850384},
 887 -       {0x0000a030, 0x03890388},
 888 -       {0x0000a034, 0x038b038a},
 889 -       {0x0000a038, 0x038d038c},
 890 -       {0x0000a03c, 0x03910390},
 891 -       {0x0000a040, 0x03930392},
 892 -       {0x0000a044, 0x03950394},
 893 -       {0x0000a048, 0x00000396},
 894 -       {0x0000a04c, 0x00000000},
 895 -       {0x0000a050, 0x00000000},
 896 -       {0x0000a054, 0x00000000},
 897 -       {0x0000a058, 0x00000000},
 898 -       {0x0000a05c, 0x00000000},
 899 -       {0x0000a060, 0x00000000},
 900 -       {0x0000a064, 0x00000000},
 901 -       {0x0000a068, 0x00000000},
 902 -       {0x0000a06c, 0x00000000},
 903 -       {0x0000a070, 0x00000000},
 904 -       {0x0000a074, 0x00000000},
 905 -       {0x0000a078, 0x00000000},
 906 -       {0x0000a07c, 0x00000000},
 907 -       {0x0000a080, 0x28282828},
 908 -       {0x0000a084, 0x28282828},
 909 -       {0x0000a088, 0x28282828},
 910 -       {0x0000a08c, 0x28282828},
 911 -       {0x0000a090, 0x28282828},
 912 -       {0x0000a094, 0x21212128},
 913 -       {0x0000a098, 0x171c1c1c},
 914 -       {0x0000a09c, 0x02020212},
 915 -       {0x0000a0a0, 0x00000202},
 916 -       {0x0000a0a4, 0x00000000},
 917 -       {0x0000a0a8, 0x00000000},
 918 -       {0x0000a0ac, 0x00000000},
 919 -       {0x0000a0b0, 0x00000000},
 920 -       {0x0000a0b4, 0x00000000},
 921 -       {0x0000a0b8, 0x00000000},
 922 -       {0x0000a0bc, 0x00000000},
 923 -       {0x0000a0c0, 0x001f0000},
 924 -       {0x0000a0c4, 0x111f1100},
 925 -       {0x0000a0c8, 0x111d111e},
 926 -       {0x0000a0cc, 0x111b111c},
 927 -       {0x0000a0d0, 0x22032204},
 928 -       {0x0000a0d4, 0x22012202},
 929 -       {0x0000a0d8, 0x221f2200},
 930 -       {0x0000a0dc, 0x221d221e},
 931 -       {0x0000a0e0, 0x33013302},
 932 -       {0x0000a0e4, 0x331f3300},
 933 -       {0x0000a0e8, 0x4402331e},
 934 -       {0x0000a0ec, 0x44004401},
 935 -       {0x0000a0f0, 0x441e441f},
 936 -       {0x0000a0f4, 0x55015502},
 937 -       {0x0000a0f8, 0x551f5500},
 938 -       {0x0000a0fc, 0x6602551e},
 939 -       {0x0000a100, 0x66006601},
 940 -       {0x0000a104, 0x661e661f},
 941 -       {0x0000a108, 0x7703661d},
 942 -       {0x0000a10c, 0x77017702},
 943 -       {0x0000a110, 0x00007700},
 944 -       {0x0000a114, 0x00000000},
 945 -       {0x0000a118, 0x00000000},
 946 -       {0x0000a11c, 0x00000000},
 947 -       {0x0000a120, 0x00000000},
 948 -       {0x0000a124, 0x00000000},
 949 -       {0x0000a128, 0x00000000},
 950 -       {0x0000a12c, 0x00000000},
 951 -       {0x0000a130, 0x00000000},
 952 -       {0x0000a134, 0x00000000},
 953 -       {0x0000a138, 0x00000000},
 954 -       {0x0000a13c, 0x00000000},
 955 -       {0x0000a140, 0x001f0000},
 956 -       {0x0000a144, 0x111f1100},
 957 -       {0x0000a148, 0x111d111e},
 958 -       {0x0000a14c, 0x111b111c},
 959 -       {0x0000a150, 0x22032204},
 960 -       {0x0000a154, 0x22012202},
 961 -       {0x0000a158, 0x221f2200},
 962 -       {0x0000a15c, 0x221d221e},
 963 -       {0x0000a160, 0x33013302},
 964 -       {0x0000a164, 0x331f3300},
 965 -       {0x0000a168, 0x4402331e},
 966 -       {0x0000a16c, 0x44004401},
 967 -       {0x0000a170, 0x441e441f},
 968 -       {0x0000a174, 0x55015502},
 969 -       {0x0000a178, 0x551f5500},
 970 -       {0x0000a17c, 0x6602551e},
 971 -       {0x0000a180, 0x66006601},
 972 -       {0x0000a184, 0x661e661f},
 973 -       {0x0000a188, 0x7703661d},
 974 -       {0x0000a18c, 0x77017702},
 975 -       {0x0000a190, 0x00007700},
 976 -       {0x0000a194, 0x00000000},
 977 -       {0x0000a198, 0x00000000},
 978 -       {0x0000a19c, 0x00000000},
 979 -       {0x0000a1a0, 0x00000000},
 980 -       {0x0000a1a4, 0x00000000},
 981 -       {0x0000a1a8, 0x00000000},
 982 -       {0x0000a1ac, 0x00000000},
 983 -       {0x0000a1b0, 0x00000000},
 984 -       {0x0000a1b4, 0x00000000},
 985 -       {0x0000a1b8, 0x00000000},
 986 -       {0x0000a1bc, 0x00000000},
 987 -       {0x0000a1c0, 0x00000000},
 988 -       {0x0000a1c4, 0x00000000},
 989 -       {0x0000a1c8, 0x00000000},
 990 -       {0x0000a1cc, 0x00000000},
 991 -       {0x0000a1d0, 0x00000000},
 992 -       {0x0000a1d4, 0x00000000},
 993 -       {0x0000a1d8, 0x00000000},
 994 -       {0x0000a1dc, 0x00000000},
 995 -       {0x0000a1e0, 0x00000000},
 996 -       {0x0000a1e4, 0x00000000},
 997 -       {0x0000a1e8, 0x00000000},
 998 -       {0x0000a1ec, 0x00000000},
 999 -       {0x0000a1f0, 0x00000396},
1000 -       {0x0000a1f4, 0x00000396},
1001 -       {0x0000a1f8, 0x00000396},
1002 -       {0x0000a1fc, 0x00000296},
1003 -};
1004 +#define ar9331_common_wo_xlna_rx_gain_1p2 ar9331_common_wo_xlna_rx_gain_1p1
1005 +
1006 +#define ar9331_common_rx_gain_1p2 ar9485_common_rx_gain_1_1
1007
1008  #endif /* INITVALS_9330_1P2_H */
1009 --- a/drivers/net/wireless/ath/ath9k/ar9340_initvals.h
1010 +++ b/drivers/net/wireless/ath/ath9k/ar9340_initvals.h
1011 @@ -100,18 +100,7 @@ static const u32 ar9340Modes_lowest_ob_d
1012         {0x00016448, 0x24925266, 0x24925266, 0x24925266, 0x24925266},
1013  };
1014
1015 -static const u32 ar9340Modes_fast_clock_1p0[][3] = {
1016 -       /* Addr      5G_HT20     5G_HT40   */
1017 -       {0x00001030, 0x00000268, 0x000004d0},
1018 -       {0x00001070, 0x0000018c, 0x00000318},
1019 -       {0x000010b0, 0x00000fd0, 0x00001fa0},
1020 -       {0x00008014, 0x044c044c, 0x08980898},
1021 -       {0x0000801c, 0x148ec02b, 0x148ec057},
1022 -       {0x00008318, 0x000044c0, 0x00008980},
1023 -       {0x00009e00, 0x0372131c, 0x0372131c},
1024 -       {0x0000a230, 0x0000000b, 0x00000016},
1025 -       {0x0000a254, 0x00000898, 0x00001130},
1026 -};
1027 +#define ar9340Modes_fast_clock_1p0 ar9300Modes_fast_clock_2p2
1028
1029  static const u32 ar9340_1p0_radio_core[][2] = {
1030         /* Addr      allmodes  */
1031 @@ -224,22 +213,9 @@ static const u32 ar9340_1p0_radio_core_4
1032         {0x000160b0, 0x01885f5a},
1033  };
1034
1035 -static const u32 ar9340_1p0_mac_postamble[][5] = {
1036 -       /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
1037 -       {0x00001030, 0x00000230, 0x00000460, 0x000002c0, 0x00000160},
1038 -       {0x00001070, 0x00000168, 0x000002d0, 0x00000318, 0x0000018c},
1039 -       {0x000010b0, 0x00000e60, 0x00001cc0, 0x00007c70, 0x00003e38},
1040 -       {0x00008014, 0x03e803e8, 0x07d007d0, 0x10801600, 0x08400b00},
1041 -       {0x0000801c, 0x128d8027, 0x128d804f, 0x12e00057, 0x12e0002b},
1042 -       {0x00008120, 0x08f04800, 0x08f04800, 0x08f04810, 0x08f04810},
1043 -       {0x000081d0, 0x00003210, 0x00003210, 0x0000320a, 0x0000320a},
1044 -       {0x00008318, 0x00003e80, 0x00007d00, 0x00006880, 0x00003440},
1045 -};
1046 +#define ar9340_1p0_mac_postamble ar9300_2p2_mac_postamble
1047
1048 -static const u32 ar9340_1p0_soc_postamble[][5] = {
1049 -       /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
1050 -       {0x00007010, 0x00000023, 0x00000023, 0x00000023, 0x00000023},
1051 -};
1052 +#define ar9340_1p0_soc_postamble ar9300_2p2_soc_postamble
1053
1054  static const u32 ar9340_1p0_baseband_postamble[][5] = {
1055         /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
1056 @@ -1359,265 +1335,7 @@ static const u32 ar9340_1p0_mac_core[][2
1057         {0x000083d0, 0x000101ff},
1058  };
1059
1060 -static const u32 ar9340Common_wo_xlna_rx_gain_table_1p0[][2] = {
1061 -       /* Addr      allmodes  */
1062 -       {0x0000a000, 0x00010000},
1063 -       {0x0000a004, 0x00030002},
1064 -       {0x0000a008, 0x00050004},
1065 -       {0x0000a00c, 0x00810080},
1066 -       {0x0000a010, 0x00830082},
1067 -       {0x0000a014, 0x01810180},
1068 -       {0x0000a018, 0x01830182},
1069 -       {0x0000a01c, 0x01850184},
1070 -       {0x0000a020, 0x01890188},
1071 -       {0x0000a024, 0x018b018a},
1072 -       {0x0000a028, 0x018d018c},
1073 -       {0x0000a02c, 0x03820190},
1074 -       {0x0000a030, 0x03840383},
1075 -       {0x0000a034, 0x03880385},
1076 -       {0x0000a038, 0x038a0389},
1077 -       {0x0000a03c, 0x038c038b},
1078 -       {0x0000a040, 0x0390038d},
1079 -       {0x0000a044, 0x03920391},
1080 -       {0x0000a048, 0x03940393},
1081 -       {0x0000a04c, 0x03960395},
1082 -       {0x0000a050, 0x00000000},
1083 -       {0x0000a054, 0x00000000},
1084 -       {0x0000a058, 0x00000000},
1085 -       {0x0000a05c, 0x00000000},
1086 -       {0x0000a060, 0x00000000},
1087 -       {0x0000a064, 0x00000000},
1088 -       {0x0000a068, 0x00000000},
1089 -       {0x0000a06c, 0x00000000},
1090 -       {0x0000a070, 0x00000000},
1091 -       {0x0000a074, 0x00000000},
1092 -       {0x0000a078, 0x00000000},
1093 -       {0x0000a07c, 0x00000000},
1094 -       {0x0000a080, 0x29292929},
1095 -       {0x0000a084, 0x29292929},
1096 -       {0x0000a088, 0x29292929},
1097 -       {0x0000a08c, 0x29292929},
1098 -       {0x0000a090, 0x22292929},
1099 -       {0x0000a094, 0x1d1d2222},
1100 -       {0x0000a098, 0x0c111117},
1101 -       {0x0000a09c, 0x00030303},
1102 -       {0x0000a0a0, 0x00000000},
1103 -       {0x0000a0a4, 0x00000000},
1104 -       {0x0000a0a8, 0x00000000},
1105 -       {0x0000a0ac, 0x00000000},
1106 -       {0x0000a0b0, 0x00000000},
1107 -       {0x0000a0b4, 0x00000000},
1108 -       {0x0000a0b8, 0x00000000},
1109 -       {0x0000a0bc, 0x00000000},
1110 -       {0x0000a0c0, 0x001f0000},
1111 -       {0x0000a0c4, 0x01000101},
1112 -       {0x0000a0c8, 0x011e011f},
1113 -       {0x0000a0cc, 0x011c011d},
1114 -       {0x0000a0d0, 0x02030204},
1115 -       {0x0000a0d4, 0x02010202},
1116 -       {0x0000a0d8, 0x021f0200},
1117 -       {0x0000a0dc, 0x0302021e},
1118 -       {0x0000a0e0, 0x03000301},
1119 -       {0x0000a0e4, 0x031e031f},
1120 -       {0x0000a0e8, 0x0402031d},
1121 -       {0x0000a0ec, 0x04000401},
1122 -       {0x0000a0f0, 0x041e041f},
1123 -       {0x0000a0f4, 0x0502041d},
1124 -       {0x0000a0f8, 0x05000501},
1125 -       {0x0000a0fc, 0x051e051f},
1126 -       {0x0000a100, 0x06010602},
1127 -       {0x0000a104, 0x061f0600},
1128 -       {0x0000a108, 0x061d061e},
1129 -       {0x0000a10c, 0x07020703},
1130 -       {0x0000a110, 0x07000701},
1131 -       {0x0000a114, 0x00000000},
1132 -       {0x0000a118, 0x00000000},
1133 -       {0x0000a11c, 0x00000000},
1134 -       {0x0000a120, 0x00000000},
1135 -       {0x0000a124, 0x00000000},
1136 -       {0x0000a128, 0x00000000},
1137 -       {0x0000a12c, 0x00000000},
1138 -       {0x0000a130, 0x00000000},
1139 -       {0x0000a134, 0x00000000},
1140 -       {0x0000a138, 0x00000000},
1141 -       {0x0000a13c, 0x00000000},
1142 -       {0x0000a140, 0x001f0000},
1143 -       {0x0000a144, 0x01000101},
1144 -       {0x0000a148, 0x011e011f},
1145 -       {0x0000a14c, 0x011c011d},
1146 -       {0x0000a150, 0x02030204},
1147 -       {0x0000a154, 0x02010202},
1148 -       {0x0000a158, 0x021f0200},
1149 -       {0x0000a15c, 0x0302021e},
1150 -       {0x0000a160, 0x03000301},
1151 -       {0x0000a164, 0x031e031f},
1152 -       {0x0000a168, 0x0402031d},
1153 -       {0x0000a16c, 0x04000401},
1154 -       {0x0000a170, 0x041e041f},
1155 -       {0x0000a174, 0x0502041d},
1156 -       {0x0000a178, 0x05000501},
1157 -       {0x0000a17c, 0x051e051f},
1158 -       {0x0000a180, 0x06010602},
1159 -       {0x0000a184, 0x061f0600},
1160 -       {0x0000a188, 0x061d061e},
1161 -       {0x0000a18c, 0x07020703},
1162 -       {0x0000a190, 0x07000701},
1163 -       {0x0000a194, 0x00000000},
1164 -       {0x0000a198, 0x00000000},
1165 -       {0x0000a19c, 0x00000000},
1166 -       {0x0000a1a0, 0x00000000},
1167 -       {0x0000a1a4, 0x00000000},
1168 -       {0x0000a1a8, 0x00000000},
1169 -       {0x0000a1ac, 0x00000000},
1170 -       {0x0000a1b0, 0x00000000},
1171 -       {0x0000a1b4, 0x00000000},
1172 -       {0x0000a1b8, 0x00000000},
1173 -       {0x0000a1bc, 0x00000000},
1174 -       {0x0000a1c0, 0x00000000},
1175 -       {0x0000a1c4, 0x00000000},
1176 -       {0x0000a1c8, 0x00000000},
1177 -       {0x0000a1cc, 0x00000000},
1178 -       {0x0000a1d0, 0x00000000},
1179 -       {0x0000a1d4, 0x00000000},
1180 -       {0x0000a1d8, 0x00000000},
1181 -       {0x0000a1dc, 0x00000000},
1182 -       {0x0000a1e0, 0x00000000},
1183 -       {0x0000a1e4, 0x00000000},
1184 -       {0x0000a1e8, 0x00000000},
1185 -       {0x0000a1ec, 0x00000000},
1186 -       {0x0000a1f0, 0x00000396},
1187 -       {0x0000a1f4, 0x00000396},
1188 -       {0x0000a1f8, 0x00000396},
1189 -       {0x0000a1fc, 0x00000196},
1190 -       {0x0000b000, 0x00010000},
1191 -       {0x0000b004, 0x00030002},
1192 -       {0x0000b008, 0x00050004},
1193 -       {0x0000b00c, 0x00810080},
1194 -       {0x0000b010, 0x00830082},
1195 -       {0x0000b014, 0x01810180},
1196 -       {0x0000b018, 0x01830182},
1197 -       {0x0000b01c, 0x01850184},
1198 -       {0x0000b020, 0x02810280},
1199 -       {0x0000b024, 0x02830282},
1200 -       {0x0000b028, 0x02850284},
1201 -       {0x0000b02c, 0x02890288},
1202 -       {0x0000b030, 0x028b028a},
1203 -       {0x0000b034, 0x0388028c},
1204 -       {0x0000b038, 0x038a0389},
1205 -       {0x0000b03c, 0x038c038b},
1206 -       {0x0000b040, 0x0390038d},
1207 -       {0x0000b044, 0x03920391},
1208 -       {0x0000b048, 0x03940393},
1209 -       {0x0000b04c, 0x03960395},
1210 -       {0x0000b050, 0x00000000},
1211 -       {0x0000b054, 0x00000000},
1212 -       {0x0000b058, 0x00000000},
1213 -       {0x0000b05c, 0x00000000},
1214 -       {0x0000b060, 0x00000000},
1215 -       {0x0000b064, 0x00000000},
1216 -       {0x0000b068, 0x00000000},
1217 -       {0x0000b06c, 0x00000000},
1218 -       {0x0000b070, 0x00000000},
1219 -       {0x0000b074, 0x00000000},
1220 -       {0x0000b078, 0x00000000},
1221 -       {0x0000b07c, 0x00000000},
1222 -       {0x0000b080, 0x32323232},
1223 -       {0x0000b084, 0x2f2f3232},
1224 -       {0x0000b088, 0x23282a2d},
1225 -       {0x0000b08c, 0x1c1e2123},
1226 -       {0x0000b090, 0x14171919},
1227 -       {0x0000b094, 0x0e0e1214},
1228 -       {0x0000b098, 0x03050707},
1229 -       {0x0000b09c, 0x00030303},
1230 -       {0x0000b0a0, 0x00000000},
1231 -       {0x0000b0a4, 0x00000000},
1232 -       {0x0000b0a8, 0x00000000},
1233 -       {0x0000b0ac, 0x00000000},
1234 -       {0x0000b0b0, 0x00000000},
1235 -       {0x0000b0b4, 0x00000000},
1236 -       {0x0000b0b8, 0x00000000},
1237 -       {0x0000b0bc, 0x00000000},
1238 -       {0x0000b0c0, 0x003f0020},
1239 -       {0x0000b0c4, 0x00400041},
1240 -       {0x0000b0c8, 0x0140005f},
1241 -       {0x0000b0cc, 0x0160015f},
1242 -       {0x0000b0d0, 0x017e017f},
1243 -       {0x0000b0d4, 0x02410242},
1244 -       {0x0000b0d8, 0x025f0240},
1245 -       {0x0000b0dc, 0x027f0260},
1246 -       {0x0000b0e0, 0x0341027e},
1247 -       {0x0000b0e4, 0x035f0340},
1248 -       {0x0000b0e8, 0x037f0360},
1249 -       {0x0000b0ec, 0x04400441},
1250 -       {0x0000b0f0, 0x0460045f},
1251 -       {0x0000b0f4, 0x0541047f},
1252 -       {0x0000b0f8, 0x055f0540},
1253 -       {0x0000b0fc, 0x057f0560},
1254 -       {0x0000b100, 0x06400641},
1255 -       {0x0000b104, 0x0660065f},
1256 -       {0x0000b108, 0x067e067f},
1257 -       {0x0000b10c, 0x07410742},
1258 -       {0x0000b110, 0x075f0740},
1259 -       {0x0000b114, 0x077f0760},
1260 -       {0x0000b118, 0x07800781},
1261 -       {0x0000b11c, 0x07a0079f},
1262 -       {0x0000b120, 0x07c107bf},
1263 -       {0x0000b124, 0x000007c0},
1264 -       {0x0000b128, 0x00000000},
1265 -       {0x0000b12c, 0x00000000},
1266 -       {0x0000b130, 0x00000000},
1267 -       {0x0000b134, 0x00000000},
1268 -       {0x0000b138, 0x00000000},
1269 -       {0x0000b13c, 0x00000000},
1270 -       {0x0000b140, 0x003f0020},
1271 -       {0x0000b144, 0x00400041},
1272 -       {0x0000b148, 0x0140005f},
1273 -       {0x0000b14c, 0x0160015f},
1274 -       {0x0000b150, 0x017e017f},
1275 -       {0x0000b154, 0x02410242},
1276 -       {0x0000b158, 0x025f0240},
1277 -       {0x0000b15c, 0x027f0260},
1278 -       {0x0000b160, 0x0341027e},
1279 -       {0x0000b164, 0x035f0340},
1280 -       {0x0000b168, 0x037f0360},
1281 -       {0x0000b16c, 0x04400441},
1282 -       {0x0000b170, 0x0460045f},
1283 -       {0x0000b174, 0x0541047f},
1284 -       {0x0000b178, 0x055f0540},
1285 -       {0x0000b17c, 0x057f0560},
1286 -       {0x0000b180, 0x06400641},
1287 -       {0x0000b184, 0x0660065f},
1288 -       {0x0000b188, 0x067e067f},
1289 -       {0x0000b18c, 0x07410742},
1290 -       {0x0000b190, 0x075f0740},
1291 -       {0x0000b194, 0x077f0760},
1292 -       {0x0000b198, 0x07800781},
1293 -       {0x0000b19c, 0x07a0079f},
1294 -       {0x0000b1a0, 0x07c107bf},
1295 -       {0x0000b1a4, 0x000007c0},
1296 -       {0x0000b1a8, 0x00000000},
1297 -       {0x0000b1ac, 0x00000000},
1298 -       {0x0000b1b0, 0x00000000},
1299 -       {0x0000b1b4, 0x00000000},
1300 -       {0x0000b1b8, 0x00000000},
1301 -       {0x0000b1bc, 0x00000000},
1302 -       {0x0000b1c0, 0x00000000},
1303 -       {0x0000b1c4, 0x00000000},
1304 -       {0x0000b1c8, 0x00000000},
1305 -       {0x0000b1cc, 0x00000000},
1306 -       {0x0000b1d0, 0x00000000},
1307 -       {0x0000b1d4, 0x00000000},
1308 -       {0x0000b1d8, 0x00000000},
1309 -       {0x0000b1dc, 0x00000000},
1310 -       {0x0000b1e0, 0x00000000},
1311 -       {0x0000b1e4, 0x00000000},
1312 -       {0x0000b1e8, 0x00000000},
1313 -       {0x0000b1ec, 0x00000000},
1314 -       {0x0000b1f0, 0x00000396},
1315 -       {0x0000b1f4, 0x00000396},
1316 -       {0x0000b1f8, 0x00000396},
1317 -       {0x0000b1fc, 0x00000196},
1318 -};
1319 +#define ar9340Common_wo_xlna_rx_gain_table_1p0 ar9300Common_wo_xlna_rx_gain_table_2p2
1320
1321  static const u32 ar9340_1p0_soc_preamble[][2] = {
1322         /* Addr      allmodes  */
1323 --- a/drivers/net/wireless/ath/ath9k/ar9462_2p0_initvals.h
1324 +++ b/drivers/net/wireless/ath/ath9k/ar9462_2p0_initvals.h
1325 @@ -1,5 +1,6 @@
1326  /*
1327 - * Copyright (c) 2010 Atheros Communications Inc.
1328 + * Copyright (c) 2010-2011 Atheros Communications Inc.
1329 + * Copyright (c) 2011-2012 Qualcomm Atheros Inc.
1330   *
1331   * Permission to use, copy, modify, and/or distribute this software for any
1332   * purpose with or without fee is hereby granted, provided that the above
1333 @@ -1007,7 +1008,7 @@ static const u32 ar9462_2p0_radio_core[]
1334
1335  static const u32 ar9462_2p0_soc_preamble[][2] = {
1336         /* Addr      allmodes  */
1337 -       {0x000040a4 ,0x00a0c1c9},
1338 +       {0x000040a4, 0x00a0c1c9},
1339         {0x00007020, 0x00000000},
1340         {0x00007034, 0x00000002},
1341         {0x00007038, 0x000004c2},
1342 --- a/drivers/net/wireless/ath/ath9k/ar9485_initvals.h
1343 +++ b/drivers/net/wireless/ath/ath9k/ar9485_initvals.h
1344 @@ -1,5 +1,6 @@
1345  /*
1346   * Copyright (c) 2010-2011 Atheros Communications Inc.
1347 + * Copyright (c) 2011-2012 Qualcomm Atheros Inc.
1348   *
1349   * Permission to use, copy, modify, and/or distribute this software for any
1350   * purpose with or without fee is hereby granted, provided that the above
1351 @@ -17,599 +18,151 @@
1352  #ifndef INITVALS_9485_H
1353  #define INITVALS_9485_H
1354
1355 -static const u32 ar9485_1_1_mac_core[][2] = {
1356 -       /*  Addr       allmodes */
1357 -       {0x00000008, 0x00000000},
1358 -       {0x00000030, 0x00020085},
1359 -       {0x00000034, 0x00000005},
1360 -       {0x00000040, 0x00000000},
1361 -       {0x00000044, 0x00000000},
1362 -       {0x00000048, 0x00000008},
1363 -       {0x0000004c, 0x00000010},
1364 -       {0x00000050, 0x00000000},
1365 -       {0x00001040, 0x002ffc0f},
1366 -       {0x00001044, 0x002ffc0f},
1367 -       {0x00001048, 0x002ffc0f},
1368 -       {0x0000104c, 0x002ffc0f},
1369 -       {0x00001050, 0x002ffc0f},
1370 -       {0x00001054, 0x002ffc0f},
1371 -       {0x00001058, 0x002ffc0f},
1372 -       {0x0000105c, 0x002ffc0f},
1373 -       {0x00001060, 0x002ffc0f},
1374 -       {0x00001064, 0x002ffc0f},
1375 -       {0x000010f0, 0x00000100},
1376 -       {0x00001270, 0x00000000},
1377 -       {0x000012b0, 0x00000000},
1378 -       {0x000012f0, 0x00000000},
1379 -       {0x0000143c, 0x00000000},
1380 -       {0x0000147c, 0x00000000},
1381 -       {0x00008000, 0x00000000},
1382 -       {0x00008004, 0x00000000},
1383 -       {0x00008008, 0x00000000},
1384 -       {0x0000800c, 0x00000000},
1385 -       {0x00008018, 0x00000000},
1386 -       {0x00008020, 0x00000000},
1387 -       {0x00008038, 0x00000000},
1388 -       {0x0000803c, 0x00000000},
1389 -       {0x00008040, 0x00000000},
1390 -       {0x00008044, 0x00000000},
1391 -       {0x00008048, 0x00000000},
1392 -       {0x0000804c, 0xffffffff},
1393 -       {0x00008054, 0x00000000},
1394 -       {0x00008058, 0x00000000},
1395 -       {0x0000805c, 0x000fc78f},
1396 -       {0x00008060, 0x0000000f},
1397 -       {0x00008064, 0x00000000},
1398 -       {0x00008070, 0x00000310},
1399 -       {0x00008074, 0x00000020},
1400 -       {0x00008078, 0x00000000},
1401 -       {0x0000809c, 0x0000000f},
1402 -       {0x000080a0, 0x00000000},
1403 -       {0x000080a4, 0x02ff0000},
1404 -       {0x000080a8, 0x0e070605},
1405 -       {0x000080ac, 0x0000000d},
1406 -       {0x000080b0, 0x00000000},
1407 -       {0x000080b4, 0x00000000},
1408 -       {0x000080b8, 0x00000000},
1409 -       {0x000080bc, 0x00000000},
1410 -       {0x000080c0, 0x2a800000},
1411 -       {0x000080c4, 0x06900168},
1412 -       {0x000080c8, 0x13881c22},
1413 -       {0x000080cc, 0x01f40000},
1414 -       {0x000080d0, 0x00252500},
1415 -       {0x000080d4, 0x00a00000},
1416 -       {0x000080d8, 0x00400000},
1417 -       {0x000080dc, 0x00000000},
1418 -       {0x000080e0, 0xffffffff},
1419 -       {0x000080e4, 0x0000ffff},
1420 -       {0x000080e8, 0x3f3f3f3f},
1421 -       {0x000080ec, 0x00000000},
1422 -       {0x000080f0, 0x00000000},
1423 -       {0x000080f4, 0x00000000},
1424 -       {0x000080fc, 0x00020000},
1425 -       {0x00008100, 0x00000000},
1426 -       {0x00008108, 0x00000052},
1427 -       {0x0000810c, 0x00000000},
1428 -       {0x00008110, 0x00000000},
1429 -       {0x00008114, 0x000007ff},
1430 -       {0x00008118, 0x000000aa},
1431 -       {0x0000811c, 0x00003210},
1432 -       {0x00008124, 0x00000000},
1433 -       {0x00008128, 0x00000000},
1434 -       {0x0000812c, 0x00000000},
1435 -       {0x00008130, 0x00000000},
1436 -       {0x00008134, 0x00000000},
1437 -       {0x00008138, 0x00000000},
1438 -       {0x0000813c, 0x0000ffff},
1439 -       {0x00008144, 0xffffffff},
1440 -       {0x00008168, 0x00000000},
1441 -       {0x0000816c, 0x00000000},
1442 -       {0x00008170, 0x18486200},
1443 -       {0x00008174, 0x33332210},
1444 -       {0x00008178, 0x00000000},
1445 -       {0x0000817c, 0x00020000},
1446 -       {0x000081c0, 0x00000000},
1447 -       {0x000081c4, 0x33332210},
1448 -       {0x000081d4, 0x00000000},
1449 -       {0x000081ec, 0x00000000},
1450 -       {0x000081f0, 0x00000000},
1451 -       {0x000081f4, 0x00000000},
1452 -       {0x000081f8, 0x00000000},
1453 -       {0x000081fc, 0x00000000},
1454 -       {0x00008240, 0x00100000},
1455 -       {0x00008244, 0x0010f400},
1456 -       {0x00008248, 0x00000800},
1457 -       {0x0000824c, 0x0001e800},
1458 -       {0x00008250, 0x00000000},
1459 -       {0x00008254, 0x00000000},
1460 -       {0x00008258, 0x00000000},
1461 -       {0x0000825c, 0x40000000},
1462 -       {0x00008260, 0x00080922},
1463 -       {0x00008264, 0x9ca00010},
1464 -       {0x00008268, 0xffffffff},
1465 -       {0x0000826c, 0x0000ffff},
1466 -       {0x00008270, 0x00000000},
1467 -       {0x00008274, 0x40000000},
1468 -       {0x00008278, 0x003e4180},
1469 -       {0x0000827c, 0x00000004},
1470 -       {0x00008284, 0x0000002c},
1471 -       {0x00008288, 0x0000002c},
1472 -       {0x0000828c, 0x000000ff},
1473 -       {0x00008294, 0x00000000},
1474 -       {0x00008298, 0x00000000},
1475 -       {0x0000829c, 0x00000000},
1476 -       {0x00008300, 0x00000140},
1477 -       {0x00008314, 0x00000000},
1478 -       {0x0000831c, 0x0000010d},
1479 -       {0x00008328, 0x00000000},
1480 -       {0x0000832c, 0x00000007},
1481 -       {0x00008330, 0x00000302},
1482 -       {0x00008334, 0x00000700},
1483 -       {0x00008338, 0x00ff0000},
1484 -       {0x0000833c, 0x02400000},
1485 -       {0x00008340, 0x000107ff},
1486 -       {0x00008344, 0xa248105b},
1487 -       {0x00008348, 0x008f0000},
1488 -       {0x0000835c, 0x00000000},
1489 -       {0x00008360, 0xffffffff},
1490 -       {0x00008364, 0xffffffff},
1491 -       {0x00008368, 0x00000000},
1492 -       {0x00008370, 0x00000000},
1493 -       {0x00008374, 0x000000ff},
1494 -       {0x00008378, 0x00000000},
1495 -       {0x0000837c, 0x00000000},
1496 -       {0x00008380, 0xffffffff},
1497 -       {0x00008384, 0xffffffff},
1498 -       {0x00008390, 0xffffffff},
1499 -       {0x00008394, 0xffffffff},
1500 -       {0x00008398, 0x00000000},
1501 -       {0x0000839c, 0x00000000},
1502 -       {0x000083a0, 0x00000000},
1503 -       {0x000083a4, 0x0000fa14},
1504 -       {0x000083a8, 0x000f0c00},
1505 -       {0x000083ac, 0x33332210},
1506 -       {0x000083b0, 0x33332210},
1507 -       {0x000083b4, 0x33332210},
1508 -       {0x000083b8, 0x33332210},
1509 -       {0x000083bc, 0x00000000},
1510 -       {0x000083c0, 0x00000000},
1511 -       {0x000083c4, 0x00000000},
1512 -       {0x000083c8, 0x00000000},
1513 -       {0x000083cc, 0x00000200},
1514 -       {0x000083d0, 0x000301ff},
1515 -};
1516 -
1517 -static const u32 ar9485_1_1_baseband_core[][2] = {
1518 -       /* Addr       allmodes */
1519 -       {0x00009800, 0xafe68e30},
1520 -       {0x00009804, 0xfd14e000},
1521 -       {0x00009808, 0x9c0a8f6b},
1522 -       {0x0000980c, 0x04800000},
1523 -       {0x00009814, 0x9280c00a},
1524 -       {0x00009818, 0x00000000},
1525 -       {0x0000981c, 0x00020028},
1526 -       {0x00009834, 0x5f3ca3de},
1527 -       {0x00009838, 0x0108ecff},
1528 -       {0x0000983c, 0x14750600},
1529 -       {0x00009880, 0x201fff00},
1530 -       {0x00009884, 0x00001042},
1531 -       {0x000098a4, 0x00200400},
1532 -       {0x000098b0, 0x52440bbe},
1533 -       {0x000098d0, 0x004b6a8e},
1534 -       {0x000098d4, 0x00000820},
1535 -       {0x000098dc, 0x00000000},
1536 -       {0x000098f0, 0x00000000},
1537 -       {0x000098f4, 0x00000000},
1538 -       {0x00009c04, 0x00000000},
1539 -       {0x00009c08, 0x03200000},
1540 -       {0x00009c0c, 0x00000000},
1541 -       {0x00009c10, 0x00000000},
1542 -       {0x00009c14, 0x00046384},
1543 -       {0x00009c18, 0x05b6b440},
1544 -       {0x00009c1c, 0x00b6b440},
1545 -       {0x00009d00, 0xc080a333},
1546 -       {0x00009d04, 0x40206c10},
1547 -       {0x00009d08, 0x009c4060},
1548 -       {0x00009d0c, 0x1883800a},
1549 -       {0x00009d10, 0x01834061},
1550 -       {0x00009d14, 0x00c00400},
1551 -       {0x00009d18, 0x00000000},
1552 -       {0x00009d1c, 0x00000000},
1553 -       {0x00009e08, 0x0038233c},
1554 -       {0x00009e24, 0x9927b515},
1555 -       {0x00009e28, 0x12ef0200},
1556 -       {0x00009e30, 0x06336f77},
1557 -       {0x00009e34, 0x6af6532f},
1558 -       {0x00009e38, 0x0cc80c00},
1559 -       {0x00009e40, 0x0d261820},
1560 -       {0x00009e4c, 0x00001004},
1561 -       {0x00009e50, 0x00ff03f1},
1562 -       {0x00009fc0, 0x80be4788},
1563 -       {0x00009fc4, 0x0001efb5},
1564 -       {0x00009fcc, 0x40000014},
1565 -       {0x0000a20c, 0x00000000},
1566 -       {0x0000a210, 0x00000000},
1567 -       {0x0000a220, 0x00000000},
1568 -       {0x0000a224, 0x00000000},
1569 -       {0x0000a228, 0x10002310},
1570 -       {0x0000a23c, 0x00000000},
1571 -       {0x0000a244, 0x0c000000},
1572 -       {0x0000a2a0, 0x00000001},
1573 -       {0x0000a2c0, 0x00000001},
1574 -       {0x0000a2c8, 0x00000000},
1575 -       {0x0000a2cc, 0x18c43433},
1576 -       {0x0000a2d4, 0x00000000},
1577 -       {0x0000a2dc, 0x00000000},
1578 -       {0x0000a2e0, 0x00000000},
1579 -       {0x0000a2e4, 0x00000000},
1580 -       {0x0000a2e8, 0x00000000},
1581 -       {0x0000a2ec, 0x00000000},
1582 -       {0x0000a2f0, 0x00000000},
1583 -       {0x0000a2f4, 0x00000000},
1584 -       {0x0000a2f8, 0x00000000},
1585 -       {0x0000a344, 0x00000000},
1586 -       {0x0000a34c, 0x00000000},
1587 -       {0x0000a350, 0x0000a000},
1588 -       {0x0000a364, 0x00000000},
1589 -       {0x0000a370, 0x00000000},
1590 -       {0x0000a390, 0x00000001},
1591 -       {0x0000a394, 0x00000444},
1592 -       {0x0000a398, 0x001f0e0f},
1593 -       {0x0000a39c, 0x0075393f},
1594 -       {0x0000a3a0, 0xb79f6427},
1595 -       {0x0000a3a4, 0x000000ff},
1596 -       {0x0000a3a8, 0x3b3b3b3b},
1597 -       {0x0000a3ac, 0x2f2f2f2f},
1598 -       {0x0000a3c0, 0x20202020},
1599 -       {0x0000a3c4, 0x22222220},
1600 -       {0x0000a3c8, 0x20200020},
1601 -       {0x0000a3cc, 0x20202020},
1602 -       {0x0000a3d0, 0x20202020},
1603 -       {0x0000a3d4, 0x20202020},
1604 -       {0x0000a3d8, 0x20202020},
1605 -       {0x0000a3dc, 0x20202020},
1606 -       {0x0000a3e0, 0x20202020},
1607 -       {0x0000a3e4, 0x20202020},
1608 -       {0x0000a3e8, 0x20202020},
1609 -       {0x0000a3ec, 0x20202020},
1610 -       {0x0000a3f0, 0x00000000},
1611 -       {0x0000a3f4, 0x00000006},
1612 -       {0x0000a3f8, 0x0cdbd380},
1613 -       {0x0000a3fc, 0x000f0f01},
1614 -       {0x0000a400, 0x8fa91f01},
1615 -       {0x0000a404, 0x00000000},
1616 -       {0x0000a408, 0x0e79e5c6},
1617 -       {0x0000a40c, 0x00820820},
1618 -       {0x0000a414, 0x1ce739cf},
1619 -       {0x0000a418, 0x2d0019ce},
1620 -       {0x0000a41c, 0x1ce739ce},
1621 -       {0x0000a420, 0x000001ce},
1622 -       {0x0000a424, 0x1ce739ce},
1623 -       {0x0000a428, 0x000001ce},
1624 -       {0x0000a42c, 0x1ce739ce},
1625 -       {0x0000a430, 0x1ce739ce},
1626 -       {0x0000a434, 0x00000000},
1627 -       {0x0000a438, 0x00001801},
1628 -       {0x0000a43c, 0x00000000},
1629 -       {0x0000a440, 0x00000000},
1630 -       {0x0000a444, 0x00000000},
1631 -       {0x0000a448, 0x04000000},
1632 -       {0x0000a44c, 0x00000001},
1633 -       {0x0000a450, 0x00010000},
1634 -       {0x0000a5c4, 0xbfad9d74},
1635 -       {0x0000a5c8, 0x0048060a},
1636 -       {0x0000a5cc, 0x00000637},
1637 -       {0x0000a760, 0x03020100},
1638 -       {0x0000a764, 0x09080504},
1639 -       {0x0000a768, 0x0d0c0b0a},
1640 -       {0x0000a76c, 0x13121110},
1641 -       {0x0000a770, 0x31301514},
1642 -       {0x0000a774, 0x35343332},
1643 -       {0x0000a778, 0x00000036},
1644 -       {0x0000a780, 0x00000838},
1645 -       {0x0000a7c0, 0x00000000},
1646 -       {0x0000a7c4, 0xfffffffc},
1647 -       {0x0000a7c8, 0x00000000},
1648 -       {0x0000a7cc, 0x00000000},
1649 -       {0x0000a7d0, 0x00000000},
1650 -       {0x0000a7d4, 0x00000004},
1651 -       {0x0000a7dc, 0x00000000},
1652 -};
1653 -
1654 -static const u32 ar9485Common_1_1[][2] = {
1655 -       /*  Addr      allmodes */
1656 -       {0x00007010, 0x00000022},
1657 -       {0x00007020, 0x00000000},
1658 -       {0x00007034, 0x00000002},
1659 -       {0x00007038, 0x000004c2},
1660 -};
1661 -
1662 -static const u32 ar9485_1_1_baseband_postamble[][5] = {
1663 -       /* Addr       5G_HT20        5G_HT40       2G_HT40       2G_HT20 */
1664 -       {0x00009810, 0xd00a8005, 0xd00a8005, 0xd00a8005, 0xd00a8005},
1665 -       {0x00009820, 0x206a002e, 0x206a002e, 0x206a002e, 0x206a002e},
1666 -       {0x00009824, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0},
1667 -       {0x00009828, 0x06903081, 0x06903081, 0x06903881, 0x06903881},
1668 -       {0x0000982c, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4},
1669 -       {0x00009830, 0x0000059c, 0x0000059c, 0x0000059c, 0x0000059c},
1670 -       {0x00009c00, 0x00000044, 0x00000044, 0x00000044, 0x00000044},
1671 -       {0x00009e00, 0x0372161e, 0x0372161e, 0x037216a0, 0x037216a0},
1672 -       {0x00009e04, 0x00182020, 0x00182020, 0x00182020, 0x00182020},
1673 -       {0x00009e0c, 0x6c4000e2, 0x6d4000e2, 0x6d4000e2, 0x6c4000e2},
1674 -       {0x00009e10, 0x7ec88d2e, 0x7ec88d2e, 0x7ec80d2e, 0x7ec80d2e},
1675 -       {0x00009e14, 0x31395d5e, 0x3139605e, 0x3139605e, 0x31395d5e},
1676 -       {0x00009e18, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1677 -       {0x00009e1c, 0x0001cf9c, 0x0001cf9c, 0x00021f9c, 0x00021f9c},
1678 -       {0x00009e20, 0x000003b5, 0x000003b5, 0x000003ce, 0x000003ce},
1679 -       {0x00009e2c, 0x0000001c, 0x0000001c, 0x00000021, 0x00000021},
1680 -       {0x00009e3c, 0xcf946220, 0xcf946220, 0xcf946222, 0xcf946222},
1681 -       {0x00009e44, 0x02321e27, 0x02321e27, 0x02282324, 0x02282324},
1682 -       {0x00009e48, 0x5030201a, 0x5030201a, 0x50302010, 0x50302010},
1683 -       {0x00009fc8, 0x0003f000, 0x0003f000, 0x0001a000, 0x0001a000},
1684 -       {0x0000a204, 0x01303fc0, 0x01303fc4, 0x01303fc4, 0x01303fc0},
1685 -       {0x0000a208, 0x00000104, 0x00000104, 0x00000004, 0x00000004},
1686 -       {0x0000a230, 0x0000400a, 0x00004014, 0x00004016, 0x0000400b},
1687 -       {0x0000a234, 0x10000fff, 0x10000fff, 0x10000fff, 0x10000fff},
1688 -       {0x0000a238, 0xffb81018, 0xffb81018, 0xffb81018, 0xffb81018},
1689 -       {0x0000a250, 0x00000000, 0x00000000, 0x00000210, 0x00000108},
1690 -       {0x0000a254, 0x000007d0, 0x00000fa0, 0x00001130, 0x00000898},
1691 -       {0x0000a258, 0x02020002, 0x02020002, 0x02020002, 0x02020002},
1692 -       {0x0000a25c, 0x01000e0e, 0x01000e0e, 0x01000e0e, 0x01000e0e},
1693 -       {0x0000a260, 0x3a021501, 0x3a021501, 0x3a021501, 0x3a021501},
1694 -       {0x0000a264, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e},
1695 -       {0x0000a280, 0x00000007, 0x00000007, 0x0000000b, 0x0000000b},
1696 -       {0x0000a284, 0x00000000, 0x00000000, 0x000002a0, 0x000002a0},
1697 -       {0x0000a288, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1698 -       {0x0000a28c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1699 -       {0x0000a2c4, 0x00158d18, 0x00158d18, 0x00158d18, 0x00158d18},
1700 -       {0x0000a2d0, 0x00071981, 0x00071981, 0x00071982, 0x00071982},
1701 -       {0x0000a2d8, 0xf999a83a, 0xf999a83a, 0xf999a83a, 0xf999a83a},
1702 -       {0x0000a358, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1703 -       {0x0000be04, 0x00802020, 0x00802020, 0x00802020, 0x00802020},
1704 -       {0x0000be18, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1705 -};
1706 -
1707 -static const u32 ar9485Modes_high_ob_db_tx_gain_1_1[][5] = {
1708 -       /* Addr        5G_HT20       5G_HT40       2G_HT40       2G_HT20 */
1709 -       {0x000098bc, 0x00000002, 0x00000002, 0x00000002, 0x00000002},
1710 -       {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d8, 0x000050d8},
1711 -       {0x0000a458, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1712 -       {0x0000a500, 0x00022200, 0x00022200, 0x00000000, 0x00000000},
1713 -       {0x0000a504, 0x05062002, 0x05062002, 0x04000002, 0x04000002},
1714 -       {0x0000a508, 0x0c002e00, 0x0c002e00, 0x08000004, 0x08000004},
1715 -       {0x0000a50c, 0x11062202, 0x11062202, 0x0d000200, 0x0d000200},
1716 -       {0x0000a510, 0x17022e00, 0x17022e00, 0x11000202, 0x11000202},
1717 -       {0x0000a514, 0x1d000ec2, 0x1d000ec2, 0x15000400, 0x15000400},
1718 -       {0x0000a518, 0x25020ec0, 0x25020ec0, 0x19000402, 0x19000402},
1719 -       {0x0000a51c, 0x2b020ec3, 0x2b020ec3, 0x1d000404, 0x1d000404},
1720 -       {0x0000a520, 0x2f001f04, 0x2f001f04, 0x21000603, 0x21000603},
1721 -       {0x0000a524, 0x35001fc4, 0x35001fc4, 0x25000605, 0x25000605},
1722 -       {0x0000a528, 0x3c022f04, 0x3c022f04, 0x2a000a03, 0x2a000a03},
1723 -       {0x0000a52c, 0x41023e85, 0x41023e85, 0x2c000a04, 0x2c000a04},
1724 -       {0x0000a530, 0x48023ec6, 0x48023ec6, 0x34000e20, 0x34000e20},
1725 -       {0x0000a534, 0x4d023f01, 0x4d023f01, 0x35000e21, 0x35000e21},
1726 -       {0x0000a538, 0x53023f4b, 0x53023f4b, 0x43000e62, 0x43000e62},
1727 -       {0x0000a53c, 0x5a027f09, 0x5a027f09, 0x45000e63, 0x45000e63},
1728 -       {0x0000a540, 0x5f027fc9, 0x5f027fc9, 0x49000e65, 0x49000e65},
1729 -       {0x0000a544, 0x6502feca, 0x6502feca, 0x4b000e66, 0x4b000e66},
1730 -       {0x0000a548, 0x6b02ff4a, 0x6b02ff4a, 0x4d001645, 0x4d001645},
1731 -       {0x0000a54c, 0x7203feca, 0x7203feca, 0x51001865, 0x51001865},
1732 -       {0x0000a550, 0x7703ff0b, 0x7703ff0b, 0x55001a86, 0x55001a86},
1733 -       {0x0000a554, 0x7d06ffcb, 0x7d06ffcb, 0x57001ce9, 0x57001ce9},
1734 -       {0x0000a558, 0x8407ff0b, 0x8407ff0b, 0x5a001ceb, 0x5a001ceb},
1735 -       {0x0000a55c, 0x8907ffcb, 0x8907ffcb, 0x5e001eeb, 0x5e001eeb},
1736 -       {0x0000a560, 0x900fff0b, 0x900fff0b, 0x5e001eeb, 0x5e001eeb},
1737 -       {0x0000a564, 0x960fffcb, 0x960fffcb, 0x5e001eeb, 0x5e001eeb},
1738 -       {0x0000a568, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
1739 -       {0x0000a56c, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
1740 -       {0x0000a570, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
1741 -       {0x0000a574, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
1742 -       {0x0000a578, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
1743 -       {0x0000a57c, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
1744 -       {0x0000b500, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1745 -       {0x0000b504, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1746 -       {0x0000b508, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1747 -       {0x0000b50c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1748 -       {0x0000b510, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1749 -       {0x0000b514, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1750 -       {0x0000b518, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1751 -       {0x0000b51c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1752 -       {0x0000b520, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1753 -       {0x0000b524, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1754 -       {0x0000b528, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1755 -       {0x0000b52c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1756 -       {0x0000b530, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1757 -       {0x0000b534, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1758 -       {0x0000b538, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1759 -       {0x0000b53c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1760 -       {0x0000b540, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1761 -       {0x0000b544, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1762 -       {0x0000b548, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1763 -       {0x0000b54c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1764 -       {0x0000b550, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1765 -       {0x0000b554, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1766 -       {0x0000b558, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1767 -       {0x0000b55c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1768 -       {0x0000b560, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1769 -       {0x0000b564, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1770 -       {0x0000b568, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1771 -       {0x0000b56c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1772 -       {0x0000b570, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1773 -       {0x0000b574, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1774 -       {0x0000b578, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1775 -       {0x0000b57c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1776 -       {0x00016044, 0x05d6b2db, 0x05d6b2db, 0x05d6b2db, 0x05d6b2db},
1777 -       {0x00016048, 0x6c924260, 0x6c924260, 0x6c924260, 0x6c924260},
1778 -};
1779 -
1780 -static const u32 ar9485_modes_lowest_ob_db_tx_gain_1_1[][5] = {
1781 -       /* Addr        5G_HT20       5G_HT40       2G_HT40       2G_HT20  */
1782 -       {0x000098bc, 0x00000002, 0x00000002, 0x00000002, 0x00000002},
1783 -       {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d8, 0x000050d8},
1784 -       {0x0000a458, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1785 -       {0x0000a500, 0x00022200, 0x00022200, 0x00000000, 0x00000000},
1786 -       {0x0000a504, 0x05062002, 0x05062002, 0x04000002, 0x04000002},
1787 -       {0x0000a508, 0x0c002e00, 0x0c002e00, 0x08000004, 0x08000004},
1788 -       {0x0000a50c, 0x11062202, 0x11062202, 0x0d000200, 0x0d000200},
1789 -       {0x0000a510, 0x17022e00, 0x17022e00, 0x11000202, 0x11000202},
1790 -       {0x0000a514, 0x1d000ec2, 0x1d000ec2, 0x15000400, 0x15000400},
1791 -       {0x0000a518, 0x25020ec0, 0x25020ec0, 0x19000402, 0x19000402},
1792 -       {0x0000a51c, 0x2b020ec3, 0x2b020ec3, 0x1d000404, 0x1d000404},
1793 -       {0x0000a520, 0x2f001f04, 0x2f001f04, 0x21000603, 0x21000603},
1794 -       {0x0000a524, 0x35001fc4, 0x35001fc4, 0x25000605, 0x25000605},
1795 -       {0x0000a528, 0x3c022f04, 0x3c022f04, 0x2a000a03, 0x2a000a03},
1796 -       {0x0000a52c, 0x41023e85, 0x41023e85, 0x2c000a04, 0x2c000a04},
1797 -       {0x0000a530, 0x48023ec6, 0x48023ec6, 0x34000e20, 0x34000e20},
1798 -       {0x0000a534, 0x4d023f01, 0x4d023f01, 0x35000e21, 0x35000e21},
1799 -       {0x0000a538, 0x53023f4b, 0x53023f4b, 0x43000e62, 0x43000e62},
1800 -       {0x0000a53c, 0x5a027f09, 0x5a027f09, 0x45000e63, 0x45000e63},
1801 -       {0x0000a540, 0x5f027fc9, 0x5f027fc9, 0x49000e65, 0x49000e65},
1802 -       {0x0000a544, 0x6502feca, 0x6502feca, 0x4b000e66, 0x4b000e66},
1803 -       {0x0000a548, 0x6b02ff4a, 0x6b02ff4a, 0x4d001645, 0x4d001645},
1804 -       {0x0000a54c, 0x7203feca, 0x7203feca, 0x51001865, 0x51001865},
1805 -       {0x0000a550, 0x7703ff0b, 0x7703ff0b, 0x55001a86, 0x55001a86},
1806 -       {0x0000a554, 0x7d06ffcb, 0x7d06ffcb, 0x57001ce9, 0x57001ce9},
1807 -       {0x0000a558, 0x8407ff0b, 0x8407ff0b, 0x5a001ceb, 0x5a001ceb},
1808 -       {0x0000a55c, 0x8907ffcb, 0x8907ffcb, 0x5e001eeb, 0x5e001eeb},
1809 -       {0x0000a560, 0x900fff0b, 0x900fff0b, 0x5e001eeb, 0x5e001eeb},
1810 -       {0x0000a564, 0x960fffcb, 0x960fffcb, 0x5e001eeb, 0x5e001eeb},
1811 -       {0x0000a568, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
1812 -       {0x0000a56c, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
1813 -       {0x0000a570, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
1814 -       {0x0000a574, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
1815 -       {0x0000a578, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
1816 -       {0x0000a57c, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
1817 -       {0x0000b500, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1818 -       {0x0000b504, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1819 -       {0x0000b508, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1820 -       {0x0000b50c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1821 -       {0x0000b510, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1822 -       {0x0000b514, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1823 -       {0x0000b518, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1824 -       {0x0000b51c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1825 -       {0x0000b520, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1826 -       {0x0000b524, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1827 -       {0x0000b528, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1828 -       {0x0000b52c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1829 -       {0x0000b530, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1830 -       {0x0000b534, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1831 -       {0x0000b538, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1832 -       {0x0000b53c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1833 -       {0x0000b540, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1834 -       {0x0000b544, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1835 -       {0x0000b548, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1836 -       {0x0000b54c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1837 -       {0x0000b550, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1838 -       {0x0000b554, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1839 -       {0x0000b558, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1840 -       {0x0000b55c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1841 -       {0x0000b560, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1842 -       {0x0000b564, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1843 -       {0x0000b568, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1844 -       {0x0000b56c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1845 -       {0x0000b570, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1846 -       {0x0000b574, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1847 -       {0x0000b578, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1848 -       {0x0000b57c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1849 -       {0x00016044, 0x05d6b2db, 0x05d6b2db, 0x05d6b2db, 0x05d6b2db},
1850 -       {0x00016048, 0x6c924260, 0x6c924260, 0x6c924260, 0x6c924260},
1851 -};
1852 -
1853 -static const u32 ar9485_1_1_radio_postamble[][2] = {
1854 -       /* Addr        allmodes */
1855 -       {0x0001609c, 0x0b283f31},
1856 -       {0x000160ac, 0x24611800},
1857 -       {0x000160b0, 0x03284f3e},
1858 -       {0x0001610c, 0x00170000},
1859 -       {0x00016140, 0x50804008},
1860 -};
1861 -
1862 -static const u32 ar9485_1_1_mac_postamble[][5] = {
1863 -       /* Addr        5G_HT20       5G_HT40       2G_HT40       2G_HT20 */
1864 -       {0x00001030, 0x00000230, 0x00000460, 0x000002c0, 0x00000160},
1865 -       {0x00001070, 0x00000168, 0x000002d0, 0x00000318, 0x0000018c},
1866 -       {0x000010b0, 0x00000e60, 0x00001cc0, 0x00007c70, 0x00003e38},
1867 -       {0x00008014, 0x03e803e8, 0x07d007d0, 0x10801600, 0x08400b00},
1868 -       {0x0000801c, 0x128d8027, 0x128d804f, 0x12e00057, 0x12e0002b},
1869 -       {0x00008120, 0x08f04800, 0x08f04800, 0x08f04810, 0x08f04810},
1870 -       {0x000081d0, 0x00003210, 0x00003210, 0x0000320a, 0x0000320a},
1871 -       {0x00008318, 0x00003e80, 0x00007d00, 0x00006880, 0x00003440},
1872 -};
1873 +/* AR9485 1.0 */
1874
1875 -static const u32 ar9485_1_1_radio_core[][2] = {
1876 -       /* Addr        allmodes */
1877 -       {0x00016000, 0x36db6db6},
1878 -       {0x00016004, 0x6db6db40},
1879 -       {0x00016008, 0x73800000},
1880 -       {0x0001600c, 0x00000000},
1881 -       {0x00016040, 0x7f80fff8},
1882 -       {0x0001604c, 0x000f0278},
1883 -       {0x00016050, 0x4db6db8c},
1884 -       {0x00016054, 0x6db60000},
1885 -       {0x00016080, 0x00080000},
1886 -       {0x00016084, 0x0e48048c},
1887 -       {0x00016088, 0x14214514},
1888 -       {0x0001608c, 0x119f081e},
1889 -       {0x00016090, 0x24926490},
1890 -       {0x00016098, 0xd28b3330},
1891 -       {0x000160a0, 0xc2108ffe},
1892 -       {0x000160a4, 0x812fc370},
1893 -       {0x000160a8, 0x423c8000},
1894 -       {0x000160b4, 0x92480040},
1895 -       {0x000160c0, 0x006db6db},
1896 -       {0x000160c4, 0x0186db60},
1897 -       {0x000160c8, 0x6db6db6c},
1898 -       {0x000160cc, 0x6de6fbe0},
1899 -       {0x000160d0, 0xf7dfcf3c},
1900 -       {0x00016100, 0x04cb0001},
1901 -       {0x00016104, 0xfff80015},
1902 -       {0x00016108, 0x00080010},
1903 -       {0x00016144, 0x01884080},
1904 -       {0x00016148, 0x00008040},
1905 -       {0x00016240, 0x08400000},
1906 -       {0x00016244, 0x1bf90f00},
1907 -       {0x00016248, 0x00000000},
1908 -       {0x0001624c, 0x00000000},
1909 -       {0x00016280, 0x01000015},
1910 -       {0x00016284, 0x00d30000},
1911 -       {0x00016288, 0x00318000},
1912 -       {0x0001628c, 0x50000000},
1913 -       {0x00016290, 0x4b96210f},
1914 -       {0x00016380, 0x00000000},
1915 -       {0x00016384, 0x00000000},
1916 -       {0x00016388, 0x00800700},
1917 -       {0x0001638c, 0x00800700},
1918 -       {0x00016390, 0x00800700},
1919 -       {0x00016394, 0x00000000},
1920 -       {0x00016398, 0x00000000},
1921 -       {0x0001639c, 0x00000000},
1922 -       {0x000163a0, 0x00000001},
1923 -       {0x000163a4, 0x00000001},
1924 -       {0x000163a8, 0x00000000},
1925 -       {0x000163ac, 0x00000000},
1926 -       {0x000163b0, 0x00000000},
1927 -       {0x000163b4, 0x00000000},
1928 -       {0x000163b8, 0x00000000},
1929 -       {0x000163bc, 0x00000000},
1930 -       {0x000163c0, 0x000000a0},
1931 -       {0x000163c4, 0x000c0000},
1932 -       {0x000163c8, 0x14021402},
1933 -       {0x000163cc, 0x00001402},
1934 -       {0x000163d0, 0x00000000},
1935 -       {0x000163d4, 0x00000000},
1936 -       {0x00016c40, 0x13188278},
1937 -       {0x00016c44, 0x12000000},
1938 -};
1939 +#define ar9485_1_1_mac_postamble ar9300_2p2_mac_postamble
1940
1941 -static const u32 ar9485_1_1_pcie_phy_pll_on_clkreq_enable_L1[][2] = {
1942 -       /* Addr        allmodes */
1943 -       {0x00018c00, 0x18052e5e},
1944 +static const u32 ar9485_1_1_pcie_phy_pll_on_clkreq_disable_L1[][2] = {
1945 +       /* Addr      allmodes  */
1946 +       {0x00018c00, 0x18012e5e},
1947         {0x00018c04, 0x000801d8},
1948         {0x00018c08, 0x0000080c},
1949  };
1950
1951 +static const u32 ar9485Common_wo_xlna_rx_gain_1_1[][2] = {
1952 +       /* Addr      allmodes  */
1953 +       {0x0000a000, 0x00060005},
1954 +       {0x0000a004, 0x00810080},
1955 +       {0x0000a008, 0x00830082},
1956 +       {0x0000a00c, 0x00850084},
1957 +       {0x0000a010, 0x01820181},
1958 +       {0x0000a014, 0x01840183},
1959 +       {0x0000a018, 0x01880185},
1960 +       {0x0000a01c, 0x018a0189},
1961 +       {0x0000a020, 0x02850284},
1962 +       {0x0000a024, 0x02890288},
1963 +       {0x0000a028, 0x028b028a},
1964 +       {0x0000a02c, 0x03850384},
1965 +       {0x0000a030, 0x03890388},
1966 +       {0x0000a034, 0x038b038a},
1967 +       {0x0000a038, 0x038d038c},
1968 +       {0x0000a03c, 0x03910390},
1969 +       {0x0000a040, 0x03930392},
1970 +       {0x0000a044, 0x03950394},
1971 +       {0x0000a048, 0x00000396},
1972 +       {0x0000a04c, 0x00000000},
1973 +       {0x0000a050, 0x00000000},
1974 +       {0x0000a054, 0x00000000},
1975 +       {0x0000a058, 0x00000000},
1976 +       {0x0000a05c, 0x00000000},
1977 +       {0x0000a060, 0x00000000},
1978 +       {0x0000a064, 0x00000000},
1979 +       {0x0000a068, 0x00000000},
1980 +       {0x0000a06c, 0x00000000},
1981 +       {0x0000a070, 0x00000000},
1982 +       {0x0000a074, 0x00000000},
1983 +       {0x0000a078, 0x00000000},
1984 +       {0x0000a07c, 0x00000000},
1985 +       {0x0000a080, 0x28282828},
1986 +       {0x0000a084, 0x28282828},
1987 +       {0x0000a088, 0x28282828},
1988 +       {0x0000a08c, 0x28282828},
1989 +       {0x0000a090, 0x28282828},
1990 +       {0x0000a094, 0x24242428},
1991 +       {0x0000a098, 0x171e1e1e},
1992 +       {0x0000a09c, 0x02020b0b},
1993 +       {0x0000a0a0, 0x02020202},
1994 +       {0x0000a0a4, 0x00000000},
1995 +       {0x0000a0a8, 0x00000000},
1996 +       {0x0000a0ac, 0x00000000},
1997 +       {0x0000a0b0, 0x00000000},
1998 +       {0x0000a0b4, 0x00000000},
1999 +       {0x0000a0b8, 0x00000000},
2000 +       {0x0000a0bc, 0x00000000},
2001 +       {0x0000a0c0, 0x22072208},
2002 +       {0x0000a0c4, 0x22052206},
2003 +       {0x0000a0c8, 0x22032204},
2004 +       {0x0000a0cc, 0x22012202},
2005 +       {0x0000a0d0, 0x221f2200},
2006 +       {0x0000a0d4, 0x221d221e},
2007 +       {0x0000a0d8, 0x33023303},
2008 +       {0x0000a0dc, 0x33003301},
2009 +       {0x0000a0e0, 0x331e331f},
2010 +       {0x0000a0e4, 0x4402331d},
2011 +       {0x0000a0e8, 0x44004401},
2012 +       {0x0000a0ec, 0x441e441f},
2013 +       {0x0000a0f0, 0x55025503},
2014 +       {0x0000a0f4, 0x55005501},
2015 +       {0x0000a0f8, 0x551e551f},
2016 +       {0x0000a0fc, 0x6602551d},
2017 +       {0x0000a100, 0x66006601},
2018 +       {0x0000a104, 0x661e661f},
2019 +       {0x0000a108, 0x7703661d},
2020 +       {0x0000a10c, 0x77017702},
2021 +       {0x0000a110, 0x00007700},
2022 +       {0x0000a114, 0x00000000},
2023 +       {0x0000a118, 0x00000000},
2024 +       {0x0000a11c, 0x00000000},
2025 +       {0x0000a120, 0x00000000},
2026 +       {0x0000a124, 0x00000000},
2027 +       {0x0000a128, 0x00000000},
2028 +       {0x0000a12c, 0x00000000},
2029 +       {0x0000a130, 0x00000000},
2030 +       {0x0000a134, 0x00000000},
2031 +       {0x0000a138, 0x00000000},
2032 +       {0x0000a13c, 0x00000000},
2033 +       {0x0000a140, 0x001f0000},
2034 +       {0x0000a144, 0x111f1100},
2035 +       {0x0000a148, 0x111d111e},
2036 +       {0x0000a14c, 0x111b111c},
2037 +       {0x0000a150, 0x22032204},
2038 +       {0x0000a154, 0x22012202},
2039 +       {0x0000a158, 0x221f2200},
2040 +       {0x0000a15c, 0x221d221e},
2041 +       {0x0000a160, 0x33013302},
2042 +       {0x0000a164, 0x331f3300},
2043 +       {0x0000a168, 0x4402331e},
2044 +       {0x0000a16c, 0x44004401},
2045 +       {0x0000a170, 0x441e441f},
2046 +       {0x0000a174, 0x55015502},
2047 +       {0x0000a178, 0x551f5500},
2048 +       {0x0000a17c, 0x6602551e},
2049 +       {0x0000a180, 0x66006601},
2050 +       {0x0000a184, 0x661e661f},
2051 +       {0x0000a188, 0x7703661d},
2052 +       {0x0000a18c, 0x77017702},
2053 +       {0x0000a190, 0x00007700},
2054 +       {0x0000a194, 0x00000000},
2055 +       {0x0000a198, 0x00000000},
2056 +       {0x0000a19c, 0x00000000},
2057 +       {0x0000a1a0, 0x00000000},
2058 +       {0x0000a1a4, 0x00000000},
2059 +       {0x0000a1a8, 0x00000000},
2060 +       {0x0000a1ac, 0x00000000},
2061 +       {0x0000a1b0, 0x00000000},
2062 +       {0x0000a1b4, 0x00000000},
2063 +       {0x0000a1b8, 0x00000000},
2064 +       {0x0000a1bc, 0x00000000},
2065 +       {0x0000a1c0, 0x00000000},
2066 +       {0x0000a1c4, 0x00000000},
2067 +       {0x0000a1c8, 0x00000000},
2068 +       {0x0000a1cc, 0x00000000},
2069 +       {0x0000a1d0, 0x00000000},
2070 +       {0x0000a1d4, 0x00000000},
2071 +       {0x0000a1d8, 0x00000000},
2072 +       {0x0000a1dc, 0x00000000},
2073 +       {0x0000a1e0, 0x00000000},
2074 +       {0x0000a1e4, 0x00000000},
2075 +       {0x0000a1e8, 0x00000000},
2076 +       {0x0000a1ec, 0x00000000},
2077 +       {0x0000a1f0, 0x00000396},
2078 +       {0x0000a1f4, 0x00000396},
2079 +       {0x0000a1f8, 0x00000396},
2080 +       {0x0000a1fc, 0x00000296},
2081 +};
2082 +
2083  static const u32 ar9485Modes_high_power_tx_gain_1_1[][5] = {
2084 -       /* Addr        5G_HT20       5G_HT40       2G_HT40       2G_HT20 */
2085 +       /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
2086         {0x000098bc, 0x00000002, 0x00000002, 0x00000002, 0x00000002},
2087         {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d8, 0x000050d8},
2088         {0x0000a458, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
2089 @@ -681,8 +234,14 @@ static const u32 ar9485Modes_high_power_
2090         {0x00016048, 0x6c924260, 0x6c924260, 0x6c924260, 0x6c924260},
2091  };
2092
2093 +#define ar9485Modes_high_ob_db_tx_gain_1_1 ar9485Modes_high_power_tx_gain_1_1
2094 +
2095 +#define ar9485Modes_low_ob_db_tx_gain_1_1 ar9485Modes_high_ob_db_tx_gain_1_1
2096 +
2097 +#define ar9485_modes_lowest_ob_db_tx_gain_1_1 ar9485Modes_low_ob_db_tx_gain_1_1
2098 +
2099  static const u32 ar9485_1_1[][2] = {
2100 -       /* Addr        allmodes */
2101 +       /* Addr      allmodes  */
2102         {0x0000a580, 0x00000000},
2103         {0x0000a584, 0x00000000},
2104         {0x0000a588, 0x00000000},
2105 @@ -701,194 +260,210 @@ static const u32 ar9485_1_1[][2] = {
2106         {0x0000a5bc, 0x00000000},
2107  };
2108
2109 -static const u32 ar9485_modes_green_ob_db_tx_gain_1_1[][5] = {
2110 -       /* Addr        5G_HT20       5G_HT40       2G_HT40       2G_HT20 */
2111 -       {0x000098bc, 0x00000003, 0x00000003, 0x00000003, 0x00000003},
2112 -       {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d8, 0x000050d8},
2113 -       {0x0000a458, 0x80000000, 0x80000000, 0x80000000, 0x80000000},
2114 -       {0x0000a500, 0x00022200, 0x00022200, 0x00000006, 0x00000006},
2115 -       {0x0000a504, 0x05062002, 0x05062002, 0x03000201, 0x03000201},
2116 -       {0x0000a508, 0x0c002e00, 0x0c002e00, 0x06000203, 0x06000203},
2117 -       {0x0000a50c, 0x11062202, 0x11062202, 0x0a000401, 0x0a000401},
2118 -       {0x0000a510, 0x17022e00, 0x17022e00, 0x0e000403, 0x0e000403},
2119 -       {0x0000a514, 0x1d000ec2, 0x1d000ec2, 0x12000405, 0x12000405},
2120 -       {0x0000a518, 0x25020ec0, 0x25020ec0, 0x15000604, 0x15000604},
2121 -       {0x0000a51c, 0x2b020ec3, 0x2b020ec3, 0x18000605, 0x18000605},
2122 -       {0x0000a520, 0x2f001f04, 0x2f001f04, 0x1c000a04, 0x1c000a04},
2123 -       {0x0000a524, 0x35001fc4, 0x35001fc4, 0x21000a06, 0x21000a06},
2124 -       {0x0000a528, 0x3c022f04, 0x3c022f04, 0x29000a24, 0x29000a24},
2125 -       {0x0000a52c, 0x41023e85, 0x41023e85, 0x2f000e21, 0x2f000e21},
2126 -       {0x0000a530, 0x48023ec6, 0x48023ec6, 0x31000e20, 0x31000e20},
2127 -       {0x0000a534, 0x4d023f01, 0x4d023f01, 0x33000e20, 0x33000e20},
2128 -       {0x0000a538, 0x53023f4b, 0x53023f4b, 0x43000e62, 0x43000e62},
2129 -       {0x0000a53c, 0x5a027f09, 0x5a027f09, 0x45000e63, 0x45000e63},
2130 -       {0x0000a540, 0x5f027fc9, 0x5f027fc9, 0x49000e65, 0x49000e65},
2131 -       {0x0000a544, 0x6502feca, 0x6502feca, 0x4b000e66, 0x4b000e66},
2132 -       {0x0000a548, 0x6b02ff4a, 0x6b02ff4a, 0x4d001645, 0x4d001645},
2133 -       {0x0000a54c, 0x7203feca, 0x7203feca, 0x51001865, 0x51001865},
2134 -       {0x0000a550, 0x7703ff0b, 0x7703ff0b, 0x55001a86, 0x55001a86},
2135 -       {0x0000a554, 0x7d06ffcb, 0x7d06ffcb, 0x57001ce9, 0x57001ce9},
2136 -       {0x0000a558, 0x8407ff0b, 0x8407ff0b, 0x5a001ceb, 0x5a001ceb},
2137 -       {0x0000a55c, 0x8907ffcb, 0x8907ffcb, 0x5e001eeb, 0x5e001eeb},
2138 -       {0x0000a560, 0x900fff0b, 0x900fff0b, 0x5e001eeb, 0x5e001eeb},
2139 -       {0x0000a564, 0x960fffcb, 0x960fffcb, 0x5e001eeb, 0x5e001eeb},
2140 -       {0x0000a568, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
2141 -       {0x0000a56c, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
2142 -       {0x0000a570, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
2143 -       {0x0000a574, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
2144 -       {0x0000a578, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
2145 -       {0x0000a57c, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
2146 -       {0x0000b500, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
2147 -       {0x0000b504, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
2148 -       {0x0000b508, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
2149 -       {0x0000b50c, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
2150 -       {0x0000b510, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
2151 -       {0x0000b514, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
2152 -       {0x0000b518, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
2153 -       {0x0000b51c, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
2154 -       {0x0000b520, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
2155 -       {0x0000b524, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
2156 -       {0x0000b528, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
2157 -       {0x0000b52c, 0x0000002a, 0x0000002a, 0x0000002a, 0x0000002a},
2158 -       {0x0000b530, 0x0000003a, 0x0000003a, 0x0000003a, 0x0000003a},
2159 -       {0x0000b534, 0x0000004a, 0x0000004a, 0x0000004a, 0x0000004a},
2160 -       {0x0000b538, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
2161 -       {0x0000b53c, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
2162 -       {0x0000b540, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
2163 -       {0x0000b544, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
2164 -       {0x0000b548, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
2165 -       {0x0000b54c, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
2166 -       {0x0000b550, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
2167 -       {0x0000b554, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
2168 -       {0x0000b558, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
2169 -       {0x0000b55c, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
2170 -       {0x0000b560, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
2171 -       {0x0000b564, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
2172 -       {0x0000b568, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
2173 -       {0x0000b56c, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
2174 -       {0x0000b570, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
2175 -       {0x0000b574, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
2176 -       {0x0000b578, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
2177 -       {0x0000b57c, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
2178 -       {0x00016044, 0x05d6b2db, 0x05d6b2db, 0x05d6b2db, 0x05d6b2db},
2179 -       {0x00016048, 0x6c924260, 0x6c924260, 0x6c924260, 0x6c924260},
2180 -};
2181 -
2182 -static const u32 ar9485_1_1_pcie_phy_clkreq_disable_L1[][2] = {
2183 -       /* Addr        allmodes */
2184 -       {0x00018c00, 0x18013e5e},
2185 -       {0x00018c04, 0x000801d8},
2186 -       {0x00018c08, 0x0000080c},
2187 -};
2188 -
2189 -static const u32 ar9485_1_1_soc_preamble[][2] = {
2190 -       /* Addr        allmodes */
2191 -       {0x00004014, 0xba280400},
2192 -       {0x00004090, 0x00aa10aa},
2193 -       {0x000040a4, 0x00a0c9c9},
2194 -       {0x00007010, 0x00000022},
2195 -       {0x00007020, 0x00000000},
2196 -       {0x00007034, 0x00000002},
2197 -       {0x00007038, 0x000004c2},
2198 -       {0x00007048, 0x00000002},
2199 -};
2200 -
2201 -static const u32 ar9485_1_1_baseband_core_txfir_coeff_japan_2484[][2] = {
2202 -       /* Addr        allmodes */
2203 -       {0x0000a398, 0x00000000},
2204 -       {0x0000a39c, 0x6f7f0301},
2205 -       {0x0000a3a0, 0xca9228ee},
2206 -};
2207 -
2208 -static const u32 ar9485Modes_low_ob_db_tx_gain_1_1[][5] = {
2209 -       /* Addr        5G_HT20       5G_HT40       2G_HT40       2G_HT20  */
2210 -       {0x000098bc, 0x00000002, 0x00000002, 0x00000002, 0x00000002},
2211 -       {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d8, 0x000050d8},
2212 -       {0x0000a458, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
2213 -       {0x0000a500, 0x00022200, 0x00022200, 0x00000000, 0x00000000},
2214 -       {0x0000a504, 0x05062002, 0x05062002, 0x04000002, 0x04000002},
2215 -       {0x0000a508, 0x0c002e00, 0x0c002e00, 0x08000004, 0x08000004},
2216 -       {0x0000a50c, 0x11062202, 0x11062202, 0x0d000200, 0x0d000200},
2217 -       {0x0000a510, 0x17022e00, 0x17022e00, 0x11000202, 0x11000202},
2218 -       {0x0000a514, 0x1d000ec2, 0x1d000ec2, 0x15000400, 0x15000400},
2219 -       {0x0000a518, 0x25020ec0, 0x25020ec0, 0x19000402, 0x19000402},
2220 -       {0x0000a51c, 0x2b020ec3, 0x2b020ec3, 0x1d000404, 0x1d000404},
2221 -       {0x0000a520, 0x2f001f04, 0x2f001f04, 0x21000603, 0x21000603},
2222 -       {0x0000a524, 0x35001fc4, 0x35001fc4, 0x25000605, 0x25000605},
2223 -       {0x0000a528, 0x3c022f04, 0x3c022f04, 0x2a000a03, 0x2a000a03},
2224 -       {0x0000a52c, 0x41023e85, 0x41023e85, 0x2c000a04, 0x2c000a04},
2225 -       {0x0000a530, 0x48023ec6, 0x48023ec6, 0x34000e20, 0x34000e20},
2226 -       {0x0000a534, 0x4d023f01, 0x4d023f01, 0x35000e21, 0x35000e21},
2227 -       {0x0000a538, 0x53023f4b, 0x53023f4b, 0x43000e62, 0x43000e62},
2228 -       {0x0000a53c, 0x5a027f09, 0x5a027f09, 0x45000e63, 0x45000e63},
2229 -       {0x0000a540, 0x5f027fc9, 0x5f027fc9, 0x49000e65, 0x49000e65},
2230 -       {0x0000a544, 0x6502feca, 0x6502feca, 0x4b000e66, 0x4b000e66},
2231 -       {0x0000a548, 0x6b02ff4a, 0x6b02ff4a, 0x4d001645, 0x4d001645},
2232 -       {0x0000a54c, 0x7203feca, 0x7203feca, 0x51001865, 0x51001865},
2233 -       {0x0000a550, 0x7703ff0b, 0x7703ff0b, 0x55001a86, 0x55001a86},
2234 -       {0x0000a554, 0x7d06ffcb, 0x7d06ffcb, 0x57001ce9, 0x57001ce9},
2235 -       {0x0000a558, 0x8407ff0b, 0x8407ff0b, 0x5a001ceb, 0x5a001ceb},
2236 -       {0x0000a55c, 0x8907ffcb, 0x8907ffcb, 0x5e001eeb, 0x5e001eeb},
2237 -       {0x0000a560, 0x900fff0b, 0x900fff0b, 0x5e001eeb, 0x5e001eeb},
2238 -       {0x0000a564, 0x960fffcb, 0x960fffcb, 0x5e001eeb, 0x5e001eeb},
2239 -       {0x0000a568, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
2240 -       {0x0000a56c, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
2241 -       {0x0000a570, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
2242 -       {0x0000a574, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
2243 -       {0x0000a578, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
2244 -       {0x0000a57c, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
2245 -       {0x0000b500, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
2246 -       {0x0000b504, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
2247 -       {0x0000b508, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
2248 -       {0x0000b50c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
2249 -       {0x0000b510, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
2250 -       {0x0000b514, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
2251 -       {0x0000b518, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
2252 -       {0x0000b51c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
2253 -       {0x0000b520, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
2254 -       {0x0000b524, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
2255 -       {0x0000b528, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
2256 -       {0x0000b52c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
2257 -       {0x0000b530, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
2258 -       {0x0000b534, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
2259 -       {0x0000b538, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
2260 -       {0x0000b53c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
2261 -       {0x0000b540, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
2262 -       {0x0000b544, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
2263 -       {0x0000b548, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
2264 -       {0x0000b54c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
2265 -       {0x0000b550, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
2266 -       {0x0000b554, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
2267 -       {0x0000b558, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
2268 -       {0x0000b55c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
2269 -       {0x0000b560, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
2270 -       {0x0000b564, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
2271 -       {0x0000b568, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
2272 -       {0x0000b56c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
2273 -       {0x0000b570, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
2274 -       {0x0000b574, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
2275 -       {0x0000b578, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
2276 -       {0x0000b57c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
2277 -       {0x00016044, 0x05d6b2db, 0x05d6b2db, 0x05d6b2db, 0x05d6b2db},
2278 -       {0x00016048, 0x6c924260, 0x6c924260, 0x6c924260, 0x6c924260},
2279 -};
2280 -
2281 -static const u32 ar9485_fast_clock_1_1_baseband_postamble[][3] = {
2282 -       /* Addr        5G_HT2        5G_HT40  */
2283 -       {0x00009e00, 0x03721821, 0x03721821},
2284 -       {0x0000a230, 0x0000400b, 0x00004016},
2285 -       {0x0000a254, 0x00000898, 0x00001130},
2286 +static const u32 ar9485_1_1_radio_core[][2] = {
2287 +       /* Addr      allmodes  */
2288 +       {0x00016000, 0x36db6db6},
2289 +       {0x00016004, 0x6db6db40},
2290 +       {0x00016008, 0x73800000},
2291 +       {0x0001600c, 0x00000000},
2292 +       {0x00016040, 0x7f80fff8},
2293 +       {0x0001604c, 0x000f0278},
2294 +       {0x00016050, 0x4db6db8c},
2295 +       {0x00016054, 0x6db60000},
2296 +       {0x00016080, 0x00080000},
2297 +       {0x00016084, 0x0e48048c},
2298 +       {0x00016088, 0x14214514},
2299 +       {0x0001608c, 0x119f081e},
2300 +       {0x00016090, 0x24926490},
2301 +       {0x00016098, 0xd28b3330},
2302 +       {0x000160a0, 0xc2108ffe},
2303 +       {0x000160a4, 0x812fc370},
2304 +       {0x000160a8, 0x423c8000},
2305 +       {0x000160b4, 0x92480040},
2306 +       {0x000160c0, 0x006db6db},
2307 +       {0x000160c4, 0x0186db60},
2308 +       {0x000160c8, 0x6db6db6c},
2309 +       {0x000160cc, 0x6de6fbe0},
2310 +       {0x000160d0, 0xf7dfcf3c},
2311 +       {0x00016100, 0x04cb0001},
2312 +       {0x00016104, 0xfff80015},
2313 +       {0x00016108, 0x00080010},
2314 +       {0x00016144, 0x01884080},
2315 +       {0x00016148, 0x00008040},
2316 +       {0x00016240, 0x08400000},
2317 +       {0x00016244, 0x1bf90f00},
2318 +       {0x00016248, 0x00000000},
2319 +       {0x0001624c, 0x00000000},
2320 +       {0x00016280, 0x01000015},
2321 +       {0x00016284, 0x00d30000},
2322 +       {0x00016288, 0x00318000},
2323 +       {0x0001628c, 0x50000000},
2324 +       {0x00016290, 0x4b96210f},
2325 +       {0x00016380, 0x00000000},
2326 +       {0x00016384, 0x00000000},
2327 +       {0x00016388, 0x00800700},
2328 +       {0x0001638c, 0x00800700},
2329 +       {0x00016390, 0x00800700},
2330 +       {0x00016394, 0x00000000},
2331 +       {0x00016398, 0x00000000},
2332 +       {0x0001639c, 0x00000000},
2333 +       {0x000163a0, 0x00000001},
2334 +       {0x000163a4, 0x00000001},
2335 +       {0x000163a8, 0x00000000},
2336 +       {0x000163ac, 0x00000000},
2337 +       {0x000163b0, 0x00000000},
2338 +       {0x000163b4, 0x00000000},
2339 +       {0x000163b8, 0x00000000},
2340 +       {0x000163bc, 0x00000000},
2341 +       {0x000163c0, 0x000000a0},
2342 +       {0x000163c4, 0x000c0000},
2343 +       {0x000163c8, 0x14021402},
2344 +       {0x000163cc, 0x00001402},
2345 +       {0x000163d0, 0x00000000},
2346 +       {0x000163d4, 0x00000000},
2347 +       {0x00016c40, 0x13188278},
2348 +       {0x00016c44, 0x12000000},
2349  };
2350
2351 -static const u32 ar9485_1_1_pcie_phy_pll_on_clkreq_disable_L1[][2] = {
2352 -       /* Addr        allmodes  */
2353 -       {0x00018c00, 0x18012e5e},
2354 -       {0x00018c04, 0x000801d8},
2355 -       {0x00018c08, 0x0000080c},
2356 +static const u32 ar9485_1_1_baseband_core[][2] = {
2357 +       /* Addr      allmodes  */
2358 +       {0x00009800, 0xafe68e30},
2359 +       {0x00009804, 0xfd14e000},
2360 +       {0x00009808, 0x9c0a8f6b},
2361 +       {0x0000980c, 0x04800000},
2362 +       {0x00009814, 0x9280c00a},
2363 +       {0x00009818, 0x00000000},
2364 +       {0x0000981c, 0x00020028},
2365 +       {0x00009834, 0x5f3ca3de},
2366 +       {0x00009838, 0x0108ecff},
2367 +       {0x0000983c, 0x14750600},
2368 +       {0x00009880, 0x201fff00},
2369 +       {0x00009884, 0x00001042},
2370 +       {0x000098a4, 0x00200400},
2371 +       {0x000098b0, 0x52440bbe},
2372 +       {0x000098d0, 0x004b6a8e},
2373 +       {0x000098d4, 0x00000820},
2374 +       {0x000098dc, 0x00000000},
2375 +       {0x000098f0, 0x00000000},
2376 +       {0x000098f4, 0x00000000},
2377 +       {0x00009c04, 0x00000000},
2378 +       {0x00009c08, 0x03200000},
2379 +       {0x00009c0c, 0x00000000},
2380 +       {0x00009c10, 0x00000000},
2381 +       {0x00009c14, 0x00046384},
2382 +       {0x00009c18, 0x05b6b440},
2383 +       {0x00009c1c, 0x00b6b440},
2384 +       {0x00009d00, 0xc080a333},
2385 +       {0x00009d04, 0x40206c10},
2386 +       {0x00009d08, 0x009c4060},
2387 +       {0x00009d0c, 0x1883800a},
2388 +       {0x00009d10, 0x01834061},
2389 +       {0x00009d14, 0x00c00400},
2390 +       {0x00009d18, 0x00000000},
2391 +       {0x00009d1c, 0x00000000},
2392 +       {0x00009e08, 0x0038233c},
2393 +       {0x00009e24, 0x9927b515},
2394 +       {0x00009e28, 0x12ef0200},
2395 +       {0x00009e30, 0x06336f77},
2396 +       {0x00009e34, 0x6af6532f},
2397 +       {0x00009e38, 0x0cc80c00},
2398 +       {0x00009e40, 0x0d261820},
2399 +       {0x00009e4c, 0x00001004},
2400 +       {0x00009e50, 0x00ff03f1},
2401 +       {0x00009fc0, 0x80be4788},
2402 +       {0x00009fc4, 0x0001efb5},
2403 +       {0x00009fcc, 0x40000014},
2404 +       {0x0000a20c, 0x00000000},
2405 +       {0x0000a210, 0x00000000},
2406 +       {0x0000a220, 0x00000000},
2407 +       {0x0000a224, 0x00000000},
2408 +       {0x0000a228, 0x10002310},
2409 +       {0x0000a23c, 0x00000000},
2410 +       {0x0000a244, 0x0c000000},
2411 +       {0x0000a2a0, 0x00000001},
2412 +       {0x0000a2c0, 0x00000001},
2413 +       {0x0000a2c8, 0x00000000},
2414 +       {0x0000a2cc, 0x18c43433},
2415 +       {0x0000a2d4, 0x00000000},
2416 +       {0x0000a2dc, 0x00000000},
2417 +       {0x0000a2e0, 0x00000000},
2418 +       {0x0000a2e4, 0x00000000},
2419 +       {0x0000a2e8, 0x00000000},
2420 +       {0x0000a2ec, 0x00000000},
2421 +       {0x0000a2f0, 0x00000000},
2422 +       {0x0000a2f4, 0x00000000},
2423 +       {0x0000a2f8, 0x00000000},
2424 +       {0x0000a344, 0x00000000},
2425 +       {0x0000a34c, 0x00000000},
2426 +       {0x0000a350, 0x0000a000},
2427 +       {0x0000a364, 0x00000000},
2428 +       {0x0000a370, 0x00000000},
2429 +       {0x0000a390, 0x00000001},
2430 +       {0x0000a394, 0x00000444},
2431 +       {0x0000a398, 0x001f0e0f},
2432 +       {0x0000a39c, 0x0075393f},
2433 +       {0x0000a3a0, 0xb79f6427},
2434 +       {0x0000a3a4, 0x000000ff},
2435 +       {0x0000a3a8, 0x3b3b3b3b},
2436 +       {0x0000a3ac, 0x2f2f2f2f},
2437 +       {0x0000a3c0, 0x20202020},
2438 +       {0x0000a3c4, 0x22222220},
2439 +       {0x0000a3c8, 0x20200020},
2440 +       {0x0000a3cc, 0x20202020},
2441 +       {0x0000a3d0, 0x20202020},
2442 +       {0x0000a3d4, 0x20202020},
2443 +       {0x0000a3d8, 0x20202020},
2444 +       {0x0000a3dc, 0x20202020},
2445 +       {0x0000a3e0, 0x20202020},
2446 +       {0x0000a3e4, 0x20202020},
2447 +       {0x0000a3e8, 0x20202020},
2448 +       {0x0000a3ec, 0x20202020},
2449 +       {0x0000a3f0, 0x00000000},
2450 +       {0x0000a3f4, 0x00000006},
2451 +       {0x0000a3f8, 0x0cdbd380},
2452 +       {0x0000a3fc, 0x000f0f01},
2453 +       {0x0000a400, 0x8fa91f01},
2454 +       {0x0000a404, 0x00000000},
2455 +       {0x0000a408, 0x0e79e5c6},
2456 +       {0x0000a40c, 0x00820820},
2457 +       {0x0000a414, 0x1ce739cf},
2458 +       {0x0000a418, 0x2d0019ce},
2459 +       {0x0000a41c, 0x1ce739ce},
2460 +       {0x0000a420, 0x000001ce},
2461 +       {0x0000a424, 0x1ce739ce},
2462 +       {0x0000a428, 0x000001ce},
2463 +       {0x0000a42c, 0x1ce739ce},
2464 +       {0x0000a430, 0x1ce739ce},
2465 +       {0x0000a434, 0x00000000},
2466 +       {0x0000a438, 0x00001801},
2467 +       {0x0000a43c, 0x00000000},
2468 +       {0x0000a440, 0x00000000},
2469 +       {0x0000a444, 0x00000000},
2470 +       {0x0000a448, 0x04000000},
2471 +       {0x0000a44c, 0x00000001},
2472 +       {0x0000a450, 0x00010000},
2473 +       {0x0000a5c4, 0xbfad9d74},
2474 +       {0x0000a5c8, 0x0048060a},
2475 +       {0x0000a5cc, 0x00000637},
2476 +       {0x0000a760, 0x03020100},
2477 +       {0x0000a764, 0x09080504},
2478 +       {0x0000a768, 0x0d0c0b0a},
2479 +       {0x0000a76c, 0x13121110},
2480 +       {0x0000a770, 0x31301514},
2481 +       {0x0000a774, 0x35343332},
2482 +       {0x0000a778, 0x00000036},
2483 +       {0x0000a780, 0x00000838},
2484 +       {0x0000a7c0, 0x00000000},
2485 +       {0x0000a7c4, 0xfffffffc},
2486 +       {0x0000a7c8, 0x00000000},
2487 +       {0x0000a7cc, 0x00000000},
2488 +       {0x0000a7d0, 0x00000000},
2489 +       {0x0000a7d4, 0x00000004},
2490 +       {0x0000a7dc, 0x00000000},
2491  };
2492
2493  static const u32 ar9485_common_rx_gain_1_1[][2] = {
2494 -       /* Addr        allmodes */
2495 +       /* Addr      allmodes  */
2496         {0x0000a000, 0x00010000},
2497         {0x0000a004, 0x00030002},
2498         {0x0000a008, 0x00050004},
2499 @@ -945,153 +520,14 @@ static const u32 ar9485_common_rx_gain_1
2500         {0x0000a0d4, 0x22012202},
2501         {0x0000a0d8, 0x221f2200},
2502         {0x0000a0dc, 0x221d221e},
2503 -       {0x0000a0e0, 0x33013302},
2504 -       {0x0000a0e4, 0x331f3300},
2505 -       {0x0000a0e8, 0x4402331e},
2506 -       {0x0000a0ec, 0x44004401},
2507 -       {0x0000a0f0, 0x441e441f},
2508 -       {0x0000a0f4, 0x55015502},
2509 -       {0x0000a0f8, 0x551f5500},
2510 -       {0x0000a0fc, 0x6602551e},
2511 -       {0x0000a100, 0x66006601},
2512 -       {0x0000a104, 0x661e661f},
2513 -       {0x0000a108, 0x7703661d},
2514 -       {0x0000a10c, 0x77017702},
2515 -       {0x0000a110, 0x00007700},
2516 -       {0x0000a114, 0x00000000},
2517 -       {0x0000a118, 0x00000000},
2518 -       {0x0000a11c, 0x00000000},
2519 -       {0x0000a120, 0x00000000},
2520 -       {0x0000a124, 0x00000000},
2521 -       {0x0000a128, 0x00000000},
2522 -       {0x0000a12c, 0x00000000},
2523 -       {0x0000a130, 0x00000000},
2524 -       {0x0000a134, 0x00000000},
2525 -       {0x0000a138, 0x00000000},
2526 -       {0x0000a13c, 0x00000000},
2527 -       {0x0000a140, 0x001f0000},
2528 -       {0x0000a144, 0x111f1100},
2529 -       {0x0000a148, 0x111d111e},
2530 -       {0x0000a14c, 0x111b111c},
2531 -       {0x0000a150, 0x22032204},
2532 -       {0x0000a154, 0x22012202},
2533 -       {0x0000a158, 0x221f2200},
2534 -       {0x0000a15c, 0x221d221e},
2535 -       {0x0000a160, 0x33013302},
2536 -       {0x0000a164, 0x331f3300},
2537 -       {0x0000a168, 0x4402331e},
2538 -       {0x0000a16c, 0x44004401},
2539 -       {0x0000a170, 0x441e441f},
2540 -       {0x0000a174, 0x55015502},
2541 -       {0x0000a178, 0x551f5500},
2542 -       {0x0000a17c, 0x6602551e},
2543 -       {0x0000a180, 0x66006601},
2544 -       {0x0000a184, 0x661e661f},
2545 -       {0x0000a188, 0x7703661d},
2546 -       {0x0000a18c, 0x77017702},
2547 -       {0x0000a190, 0x00007700},
2548 -       {0x0000a194, 0x00000000},
2549 -       {0x0000a198, 0x00000000},
2550 -       {0x0000a19c, 0x00000000},
2551 -       {0x0000a1a0, 0x00000000},
2552 -       {0x0000a1a4, 0x00000000},
2553 -       {0x0000a1a8, 0x00000000},
2554 -       {0x0000a1ac, 0x00000000},
2555 -       {0x0000a1b0, 0x00000000},
2556 -       {0x0000a1b4, 0x00000000},
2557 -       {0x0000a1b8, 0x00000000},
2558 -       {0x0000a1bc, 0x00000000},
2559 -       {0x0000a1c0, 0x00000000},
2560 -       {0x0000a1c4, 0x00000000},
2561 -       {0x0000a1c8, 0x00000000},
2562 -       {0x0000a1cc, 0x00000000},
2563 -       {0x0000a1d0, 0x00000000},
2564 -       {0x0000a1d4, 0x00000000},
2565 -       {0x0000a1d8, 0x00000000},
2566 -       {0x0000a1dc, 0x00000000},
2567 -       {0x0000a1e0, 0x00000000},
2568 -       {0x0000a1e4, 0x00000000},
2569 -       {0x0000a1e8, 0x00000000},
2570 -       {0x0000a1ec, 0x00000000},
2571 -       {0x0000a1f0, 0x00000396},
2572 -       {0x0000a1f4, 0x00000396},
2573 -       {0x0000a1f8, 0x00000396},
2574 -       {0x0000a1fc, 0x00000296},
2575 -};
2576 -
2577 -static const u32 ar9485_1_1_pcie_phy_clkreq_enable_L1[][2] = {
2578 -       /* Addr        allmodes */
2579 -       {0x00018c00, 0x18053e5e},
2580 -       {0x00018c04, 0x000801d8},
2581 -       {0x00018c08, 0x0000080c},
2582 -};
2583 -
2584 -static const u32 ar9485Common_wo_xlna_rx_gain_1_1[][2] = {
2585 -       /* Addr        allmodes */
2586 -       {0x0000a000, 0x00060005},
2587 -       {0x0000a004, 0x00810080},
2588 -       {0x0000a008, 0x00830082},
2589 -       {0x0000a00c, 0x00850084},
2590 -       {0x0000a010, 0x01820181},
2591 -       {0x0000a014, 0x01840183},
2592 -       {0x0000a018, 0x01880185},
2593 -       {0x0000a01c, 0x018a0189},
2594 -       {0x0000a020, 0x02850284},
2595 -       {0x0000a024, 0x02890288},
2596 -       {0x0000a028, 0x028b028a},
2597 -       {0x0000a02c, 0x03850384},
2598 -       {0x0000a030, 0x03890388},
2599 -       {0x0000a034, 0x038b038a},
2600 -       {0x0000a038, 0x038d038c},
2601 -       {0x0000a03c, 0x03910390},
2602 -       {0x0000a040, 0x03930392},
2603 -       {0x0000a044, 0x03950394},
2604 -       {0x0000a048, 0x00000396},
2605 -       {0x0000a04c, 0x00000000},
2606 -       {0x0000a050, 0x00000000},
2607 -       {0x0000a054, 0x00000000},
2608 -       {0x0000a058, 0x00000000},
2609 -       {0x0000a05c, 0x00000000},
2610 -       {0x0000a060, 0x00000000},
2611 -       {0x0000a064, 0x00000000},
2612 -       {0x0000a068, 0x00000000},
2613 -       {0x0000a06c, 0x00000000},
2614 -       {0x0000a070, 0x00000000},
2615 -       {0x0000a074, 0x00000000},
2616 -       {0x0000a078, 0x00000000},
2617 -       {0x0000a07c, 0x00000000},
2618 -       {0x0000a080, 0x28282828},
2619 -       {0x0000a084, 0x28282828},
2620 -       {0x0000a088, 0x28282828},
2621 -       {0x0000a08c, 0x28282828},
2622 -       {0x0000a090, 0x28282828},
2623 -       {0x0000a094, 0x24242428},
2624 -       {0x0000a098, 0x171e1e1e},
2625 -       {0x0000a09c, 0x02020b0b},
2626 -       {0x0000a0a0, 0x02020202},
2627 -       {0x0000a0a4, 0x00000000},
2628 -       {0x0000a0a8, 0x00000000},
2629 -       {0x0000a0ac, 0x00000000},
2630 -       {0x0000a0b0, 0x00000000},
2631 -       {0x0000a0b4, 0x00000000},
2632 -       {0x0000a0b8, 0x00000000},
2633 -       {0x0000a0bc, 0x00000000},
2634 -       {0x0000a0c0, 0x22072208},
2635 -       {0x0000a0c4, 0x22052206},
2636 -       {0x0000a0c8, 0x22032204},
2637 -       {0x0000a0cc, 0x22012202},
2638 -       {0x0000a0d0, 0x221f2200},
2639 -       {0x0000a0d4, 0x221d221e},
2640 -       {0x0000a0d8, 0x33023303},
2641 -       {0x0000a0dc, 0x33003301},
2642 -       {0x0000a0e0, 0x331e331f},
2643 -       {0x0000a0e4, 0x4402331d},
2644 -       {0x0000a0e8, 0x44004401},
2645 -       {0x0000a0ec, 0x441e441f},
2646 -       {0x0000a0f0, 0x55025503},
2647 -       {0x0000a0f4, 0x55005501},
2648 -       {0x0000a0f8, 0x551e551f},
2649 -       {0x0000a0fc, 0x6602551d},
2650 +       {0x0000a0e0, 0x33013302},
2651 +       {0x0000a0e4, 0x331f3300},
2652 +       {0x0000a0e8, 0x4402331e},
2653 +       {0x0000a0ec, 0x44004401},
2654 +       {0x0000a0f0, 0x441e441f},
2655 +       {0x0000a0f4, 0x55015502},
2656 +       {0x0000a0f8, 0x551f5500},
2657 +       {0x0000a0fc, 0x6602551e},
2658         {0x0000a100, 0x66006601},
2659         {0x0000a104, 0x661e661f},
2660         {0x0000a108, 0x7703661d},
2661 @@ -1158,4 +594,260 @@ static const u32 ar9485Common_wo_xlna_rx
2662         {0x0000a1fc, 0x00000296},
2663  };
2664
2665 -#endif
2666 +static const u32 ar9485_1_1_pcie_phy_pll_on_clkreq_enable_L1[][2] = {
2667 +       /* Addr      allmodes  */
2668 +       {0x00018c00, 0x18052e5e},
2669 +       {0x00018c04, 0x000801d8},
2670 +       {0x00018c08, 0x0000080c},
2671 +};
2672 +
2673 +static const u32 ar9485_1_1_pcie_phy_clkreq_enable_L1[][2] = {
2674 +       /* Addr      allmodes  */
2675 +       {0x00018c00, 0x18053e5e},
2676 +       {0x00018c04, 0x000801d8},
2677 +       {0x00018c08, 0x0000080c},
2678 +};
2679 +
2680 +static const u32 ar9485_1_1_soc_preamble[][2] = {
2681 +       /* Addr      allmodes  */
2682 +       {0x00004014, 0xba280400},
2683 +       {0x00004090, 0x00aa10aa},
2684 +       {0x000040a4, 0x00a0c9c9},
2685 +       {0x00007010, 0x00000022},
2686 +       {0x00007020, 0x00000000},
2687 +       {0x00007034, 0x00000002},
2688 +       {0x00007038, 0x000004c2},
2689 +       {0x00007048, 0x00000002},
2690 +};
2691 +
2692 +static const u32 ar9485_fast_clock_1_1_baseband_postamble[][3] = {
2693 +       /* Addr      5G_HT20     5G_HT40   */
2694 +       {0x00009e00, 0x03721821, 0x03721821},
2695 +       {0x0000a230, 0x0000400b, 0x00004016},
2696 +       {0x0000a254, 0x00000898, 0x00001130},
2697 +};
2698 +
2699 +static const u32 ar9485_1_1_baseband_postamble[][5] = {
2700 +       /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
2701 +       {0x00009810, 0xd00a8005, 0xd00a8005, 0xd00a8005, 0xd00a8005},
2702 +       {0x00009820, 0x206a002e, 0x206a002e, 0x206a002e, 0x206a002e},
2703 +       {0x00009824, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0},
2704 +       {0x00009828, 0x06903081, 0x06903081, 0x06903881, 0x06903881},
2705 +       {0x0000982c, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4},
2706 +       {0x00009830, 0x0000059c, 0x0000059c, 0x0000059c, 0x0000059c},
2707 +       {0x00009c00, 0x00000044, 0x00000044, 0x00000044, 0x00000044},
2708 +       {0x00009e00, 0x0372161e, 0x0372161e, 0x037216a0, 0x037216a0},
2709 +       {0x00009e04, 0x00182020, 0x00182020, 0x00182020, 0x00182020},
2710 +       {0x00009e0c, 0x6c4000e2, 0x6d4000e2, 0x6d4000e2, 0x6c4000e2},
2711 +       {0x00009e10, 0x7ec88d2e, 0x7ec88d2e, 0x7ec80d2e, 0x7ec80d2e},
2712 +       {0x00009e14, 0x31395d5e, 0x3139605e, 0x3139605e, 0x31395d5e},
2713 +       {0x00009e18, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
2714 +       {0x00009e1c, 0x0001cf9c, 0x0001cf9c, 0x00021f9c, 0x00021f9c},
2715 +       {0x00009e20, 0x000003b5, 0x000003b5, 0x000003ce, 0x000003ce},
2716 +       {0x00009e2c, 0x0000001c, 0x0000001c, 0x00000021, 0x00000021},
2717 +       {0x00009e3c, 0xcf946220, 0xcf946220, 0xcf946222, 0xcf946222},
2718 +       {0x00009e44, 0x02321e27, 0x02321e27, 0x02282324, 0x02282324},
2719 +       {0x00009e48, 0x5030201a, 0x5030201a, 0x50302010, 0x50302010},
2720 +       {0x00009fc8, 0x0003f000, 0x0003f000, 0x0001a000, 0x0001a000},
2721 +       {0x0000a204, 0x01303fc0, 0x01303fc4, 0x01303fc4, 0x01303fc0},
2722 +       {0x0000a208, 0x00000104, 0x00000104, 0x00000004, 0x00000004},
2723 +       {0x0000a230, 0x0000400a, 0x00004014, 0x00004016, 0x0000400b},
2724 +       {0x0000a234, 0x10000fff, 0x10000fff, 0x10000fff, 0x10000fff},
2725 +       {0x0000a238, 0xffb81018, 0xffb81018, 0xffb81018, 0xffb81018},
2726 +       {0x0000a250, 0x00000000, 0x00000000, 0x00000210, 0x00000108},
2727 +       {0x0000a254, 0x000007d0, 0x00000fa0, 0x00001130, 0x00000898},
2728 +       {0x0000a258, 0x02020002, 0x02020002, 0x02020002, 0x02020002},
2729 +       {0x0000a25c, 0x01000e0e, 0x01000e0e, 0x01000e0e, 0x01000e0e},
2730 +       {0x0000a260, 0x3a021501, 0x3a021501, 0x3a021501, 0x3a021501},
2731 +       {0x0000a264, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e},
2732 +       {0x0000a280, 0x00000007, 0x00000007, 0x0000000b, 0x0000000b},
2733 +       {0x0000a284, 0x00000000, 0x00000000, 0x000002a0, 0x000002a0},
2734 +       {0x0000a288, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
2735 +       {0x0000a28c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
2736 +       {0x0000a2c4, 0x00158d18, 0x00158d18, 0x00158d18, 0x00158d18},
2737 +       {0x0000a2d0, 0x00071981, 0x00071981, 0x00071982, 0x00071982},
2738 +       {0x0000a2d8, 0xf999a83a, 0xf999a83a, 0xf999a83a, 0xf999a83a},
2739 +       {0x0000a358, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
2740 +       {0x0000be04, 0x00802020, 0x00802020, 0x00802020, 0x00802020},
2741 +       {0x0000be18, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
2742 +};
2743 +
2744 +static const u32 ar9485_1_1_pcie_phy_clkreq_disable_L1[][2] = {
2745 +       /* Addr      allmodes  */
2746 +       {0x00018c00, 0x18013e5e},
2747 +       {0x00018c04, 0x000801d8},
2748 +       {0x00018c08, 0x0000080c},
2749 +};
2750 +
2751 +static const u32 ar9485_1_1_radio_postamble[][2] = {
2752 +       /* Addr      allmodes  */
2753 +       {0x0001609c, 0x0b283f31},
2754 +       {0x000160ac, 0x24611800},
2755 +       {0x000160b0, 0x03284f3e},
2756 +       {0x0001610c, 0x00170000},
2757 +       {0x00016140, 0x50804008},
2758 +};
2759 +
2760 +static const u32 ar9485_1_1_mac_core[][2] = {
2761 +       /* Addr      allmodes  */
2762 +       {0x00000008, 0x00000000},
2763 +       {0x00000030, 0x00020085},
2764 +       {0x00000034, 0x00000005},
2765 +       {0x00000040, 0x00000000},
2766 +       {0x00000044, 0x00000000},
2767 +       {0x00000048, 0x00000008},
2768 +       {0x0000004c, 0x00000010},
2769 +       {0x00000050, 0x00000000},
2770 +       {0x00001040, 0x002ffc0f},
2771 +       {0x00001044, 0x002ffc0f},
2772 +       {0x00001048, 0x002ffc0f},
2773 +       {0x0000104c, 0x002ffc0f},
2774 +       {0x00001050, 0x002ffc0f},
2775 +       {0x00001054, 0x002ffc0f},
2776 +       {0x00001058, 0x002ffc0f},
2777 +       {0x0000105c, 0x002ffc0f},
2778 +       {0x00001060, 0x002ffc0f},
2779 +       {0x00001064, 0x002ffc0f},
2780 +       {0x000010f0, 0x00000100},
2781 +       {0x00001270, 0x00000000},
2782 +       {0x000012b0, 0x00000000},
2783 +       {0x000012f0, 0x00000000},
2784 +       {0x0000143c, 0x00000000},
2785 +       {0x0000147c, 0x00000000},
2786 +       {0x00008000, 0x00000000},
2787 +       {0x00008004, 0x00000000},
2788 +       {0x00008008, 0x00000000},
2789 +       {0x0000800c, 0x00000000},
2790 +       {0x00008018, 0x00000000},
2791 +       {0x00008020, 0x00000000},
2792 +       {0x00008038, 0x00000000},
2793 +       {0x0000803c, 0x00000000},
2794 +       {0x00008040, 0x00000000},
2795 +       {0x00008044, 0x00000000},
2796 +       {0x00008048, 0x00000000},
2797 +       {0x0000804c, 0xffffffff},
2798 +       {0x00008054, 0x00000000},
2799 +       {0x00008058, 0x00000000},
2800 +       {0x0000805c, 0x000fc78f},
2801 +       {0x00008060, 0x0000000f},
2802 +       {0x00008064, 0x00000000},
2803 +       {0x00008070, 0x00000310},
2804 +       {0x00008074, 0x00000020},
2805 +       {0x00008078, 0x00000000},
2806 +       {0x0000809c, 0x0000000f},
2807 +       {0x000080a0, 0x00000000},
2808 +       {0x000080a4, 0x02ff0000},
2809 +       {0x000080a8, 0x0e070605},
2810 +       {0x000080ac, 0x0000000d},
2811 +       {0x000080b0, 0x00000000},
2812 +       {0x000080b4, 0x00000000},
2813 +       {0x000080b8, 0x00000000},
2814 +       {0x000080bc, 0x00000000},
2815 +       {0x000080c0, 0x2a800000},
2816 +       {0x000080c4, 0x06900168},
2817 +       {0x000080c8, 0x13881c22},
2818 +       {0x000080cc, 0x01f40000},
2819 +       {0x000080d0, 0x00252500},
2820 +       {0x000080d4, 0x00a00000},
2821 +       {0x000080d8, 0x00400000},
2822 +       {0x000080dc, 0x00000000},
2823 +       {0x000080e0, 0xffffffff},
2824 +       {0x000080e4, 0x0000ffff},
2825 +       {0x000080e8, 0x3f3f3f3f},
2826 +       {0x000080ec, 0x00000000},
2827 +       {0x000080f0, 0x00000000},
2828 +       {0x000080f4, 0x00000000},
2829 +       {0x000080fc, 0x00020000},
2830 +       {0x00008100, 0x00000000},
2831 +       {0x00008108, 0x00000052},
2832 +       {0x0000810c, 0x00000000},
2833 +       {0x00008110, 0x00000000},
2834 +       {0x00008114, 0x000007ff},
2835 +       {0x00008118, 0x000000aa},
2836 +       {0x0000811c, 0x00003210},
2837 +       {0x00008124, 0x00000000},
2838 +       {0x00008128, 0x00000000},
2839 +       {0x0000812c, 0x00000000},
2840 +       {0x00008130, 0x00000000},
2841 +       {0x00008134, 0x00000000},
2842 +       {0x00008138, 0x00000000},
2843 +       {0x0000813c, 0x0000ffff},
2844 +       {0x00008144, 0xffffffff},
2845 +       {0x00008168, 0x00000000},
2846 +       {0x0000816c, 0x00000000},
2847 +       {0x00008170, 0x18486200},
2848 +       {0x00008174, 0x33332210},
2849 +       {0x00008178, 0x00000000},
2850 +       {0x0000817c, 0x00020000},
2851 +       {0x000081c0, 0x00000000},
2852 +       {0x000081c4, 0x33332210},
2853 +       {0x000081d4, 0x00000000},
2854 +       {0x000081ec, 0x00000000},
2855 +       {0x000081f0, 0x00000000},
2856 +       {0x000081f4, 0x00000000},
2857 +       {0x000081f8, 0x00000000},
2858 +       {0x000081fc, 0x00000000},
2859 +       {0x00008240, 0x00100000},
2860 +       {0x00008244, 0x0010f400},
2861 +       {0x00008248, 0x00000800},
2862 +       {0x0000824c, 0x0001e800},
2863 +       {0x00008250, 0x00000000},
2864 +       {0x00008254, 0x00000000},
2865 +       {0x00008258, 0x00000000},
2866 +       {0x0000825c, 0x40000000},
2867 +       {0x00008260, 0x00080922},
2868 +       {0x00008264, 0x9ca00010},
2869 +       {0x00008268, 0xffffffff},
2870 +       {0x0000826c, 0x0000ffff},
2871 +       {0x00008270, 0x00000000},
2872 +       {0x00008274, 0x40000000},
2873 +       {0x00008278, 0x003e4180},
2874 +       {0x0000827c, 0x00000004},
2875 +       {0x00008284, 0x0000002c},
2876 +       {0x00008288, 0x0000002c},
2877 +       {0x0000828c, 0x000000ff},
2878 +       {0x00008294, 0x00000000},
2879 +       {0x00008298, 0x00000000},
2880 +       {0x0000829c, 0x00000000},
2881 +       {0x00008300, 0x00000140},
2882 +       {0x00008314, 0x00000000},
2883 +       {0x0000831c, 0x0000010d},
2884 +       {0x00008328, 0x00000000},
2885 +       {0x0000832c, 0x00000007},
2886 +       {0x00008330, 0x00000302},
2887 +       {0x00008334, 0x00000700},
2888 +       {0x00008338, 0x00ff0000},
2889 +       {0x0000833c, 0x02400000},
2890 +       {0x00008340, 0x000107ff},
2891 +       {0x00008344, 0xa248105b},
2892 +       {0x00008348, 0x008f0000},
2893 +       {0x0000835c, 0x00000000},
2894 +       {0x00008360, 0xffffffff},
2895 +       {0x00008364, 0xffffffff},
2896 +       {0x00008368, 0x00000000},
2897 +       {0x00008370, 0x00000000},
2898 +       {0x00008374, 0x000000ff},
2899 +       {0x00008378, 0x00000000},
2900 +       {0x0000837c, 0x00000000},
2901 +       {0x00008380, 0xffffffff},
2902 +       {0x00008384, 0xffffffff},
2903 +       {0x00008390, 0xffffffff},
2904 +       {0x00008394, 0xffffffff},
2905 +       {0x00008398, 0x00000000},
2906 +       {0x0000839c, 0x00000000},
2907 +       {0x000083a0, 0x00000000},
2908 +       {0x000083a4, 0x0000fa14},
2909 +       {0x000083a8, 0x000f0c00},
2910 +       {0x000083ac, 0x33332210},
2911 +       {0x000083b0, 0x33332210},
2912 +       {0x000083b4, 0x33332210},
2913 +       {0x000083b8, 0x33332210},
2914 +       {0x000083bc, 0x00000000},
2915 +       {0x000083c0, 0x00000000},
2916 +       {0x000083c4, 0x00000000},
2917 +       {0x000083c8, 0x00000000},
2918 +       {0x000083cc, 0x00000200},
2919 +       {0x000083d0, 0x000301ff},
2920 +};
2921 +
2922 +#endif /* INITVALS_9485_H */
2923 --- a/drivers/net/wireless/ath/ath9k/ar9580_1p0_initvals.h
2924 +++ b/drivers/net/wireless/ath/ath9k/ar9580_1p0_initvals.h
2925 @@ -1,5 +1,6 @@
2926  /*
2927 - * Copyright (c) 2010 Atheros Communications Inc.
2928 + * Copyright (c) 2010-2011 Atheros Communications Inc.
2929 + * Copyright (c) 2011-2012 Qualcomm Atheros Inc.
2930   *
2931   * Permission to use, copy, modify, and/or distribute this software for any
2932   * purpose with or without fee is hereby granted, provided that the above
2933 @@ -19,18 +20,7 @@
2934
2935  /* AR9580 1.0 */
2936
2937 -static const u32 ar9580_1p0_modes_fast_clock[][3] = {
2938 -       /* Addr      5G_HT20     5G_HT40   */
2939 -       {0x00001030, 0x00000268, 0x000004d0},
2940 -       {0x00001070, 0x0000018c, 0x00000318},
2941 -       {0x000010b0, 0x00000fd0, 0x00001fa0},
2942 -       {0x00008014, 0x044c044c, 0x08980898},
2943 -       {0x0000801c, 0x148ec02b, 0x148ec057},
2944 -       {0x00008318, 0x000044c0, 0x00008980},
2945 -       {0x00009e00, 0x0372131c, 0x0372131c},
2946 -       {0x0000a230, 0x0000000b, 0x00000016},
2947 -       {0x0000a254, 0x00000898, 0x00001130},
2948 -};
2949 +#define ar9580_1p0_modes_fast_clock ar9300Modes_fast_clock_2p2
2950
2951  static const u32 ar9580_1p0_radio_postamble[][5] = {
2952         /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
2953 @@ -208,17 +198,7 @@ static const u32 ar9580_1p0_baseband_cor
2954         {0x0000c420, 0x00000000},
2955  };
2956
2957 -static const u32 ar9580_1p0_mac_postamble[][5] = {
2958 -       /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
2959 -       {0x00001030, 0x00000230, 0x00000460, 0x000002c0, 0x00000160},
2960 -       {0x00001070, 0x00000168, 0x000002d0, 0x00000318, 0x0000018c},
2961 -       {0x000010b0, 0x00000e60, 0x00001cc0, 0x00007c70, 0x00003e38},
2962 -       {0x00008014, 0x03e803e8, 0x07d007d0, 0x10801600, 0x08400b00},
2963 -       {0x0000801c, 0x128d8027, 0x128d804f, 0x12e00057, 0x12e0002b},
2964 -       {0x00008120, 0x08f04800, 0x08f04800, 0x08f04810, 0x08f04810},
2965 -       {0x000081d0, 0x00003210, 0x00003210, 0x0000320a, 0x0000320a},
2966 -       {0x00008318, 0x00003e80, 0x00007d00, 0x00006880, 0x00003440},
2967 -};
2968 +#define ar9580_1p0_mac_postamble ar9300_2p2_mac_postamble
2969
2970  static const u32 ar9580_1p0_low_ob_db_tx_gain_table[][5] = {
2971         /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
2972 @@ -326,111 +306,7 @@ static const u32 ar9580_1p0_low_ob_db_tx
2973         {0x00016868, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
2974  };
2975
2976 -static const u32 ar9580_1p0_high_power_tx_gain_table[][5] = {
2977 -       /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
2978 -       {0x0000a2dc, 0x0380c7fc, 0x0380c7fc, 0x03aaa352, 0x03aaa352},
2979 -       {0x0000a2e0, 0x0000f800, 0x0000f800, 0x03ccc584, 0x03ccc584},
2980 -       {0x0000a2e4, 0x03ff0000, 0x03ff0000, 0x03f0f800, 0x03f0f800},
2981 -       {0x0000a2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
2982 -       {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d9, 0x000050d9},
2983 -       {0x0000a500, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
2984 -       {0x0000a504, 0x06000003, 0x06000003, 0x04000002, 0x04000002},
2985 -       {0x0000a508, 0x0a000020, 0x0a000020, 0x08000004, 0x08000004},
2986 -       {0x0000a50c, 0x10000023, 0x10000023, 0x0b000200, 0x0b000200},
2987 -       {0x0000a510, 0x16000220, 0x16000220, 0x0f000202, 0x0f000202},
2988 -       {0x0000a514, 0x1c000223, 0x1c000223, 0x12000400, 0x12000400},
2989 -       {0x0000a518, 0x21002220, 0x21002220, 0x16000402, 0x16000402},
2990 -       {0x0000a51c, 0x27002223, 0x27002223, 0x19000404, 0x19000404},
2991 -       {0x0000a520, 0x2b022220, 0x2b022220, 0x1c000603, 0x1c000603},
2992 -       {0x0000a524, 0x2f022222, 0x2f022222, 0x21000a02, 0x21000a02},
2993 -       {0x0000a528, 0x34022225, 0x34022225, 0x25000a04, 0x25000a04},
2994 -       {0x0000a52c, 0x3a02222a, 0x3a02222a, 0x28000a20, 0x28000a20},
2995 -       {0x0000a530, 0x3e02222c, 0x3e02222c, 0x2c000e20, 0x2c000e20},
2996 -       {0x0000a534, 0x4202242a, 0x4202242a, 0x30000e22, 0x30000e22},
2997 -       {0x0000a538, 0x4702244a, 0x4702244a, 0x34000e24, 0x34000e24},
2998 -       {0x0000a53c, 0x4b02244c, 0x4b02244c, 0x38001640, 0x38001640},
2999 -       {0x0000a540, 0x4e02246c, 0x4e02246c, 0x3c001660, 0x3c001660},
3000 -       {0x0000a544, 0x5302266c, 0x5302266c, 0x3f001861, 0x3f001861},
3001 -       {0x0000a548, 0x5702286c, 0x5702286c, 0x43001a81, 0x43001a81},
3002 -       {0x0000a54c, 0x5c02486b, 0x5c02486b, 0x47001a83, 0x47001a83},
3003 -       {0x0000a550, 0x61024a6c, 0x61024a6c, 0x4a001c84, 0x4a001c84},
3004 -       {0x0000a554, 0x66026a6c, 0x66026a6c, 0x4e001ce3, 0x4e001ce3},
3005 -       {0x0000a558, 0x6b026e6c, 0x6b026e6c, 0x52001ce5, 0x52001ce5},
3006 -       {0x0000a55c, 0x7002708c, 0x7002708c, 0x56001ce9, 0x56001ce9},
3007 -       {0x0000a560, 0x7302b08a, 0x7302b08a, 0x5a001ceb, 0x5a001ceb},
3008 -       {0x0000a564, 0x7702b08c, 0x7702b08c, 0x5d001eec, 0x5d001eec},
3009 -       {0x0000a568, 0x7702b08c, 0x7702b08c, 0x5d001eec, 0x5d001eec},
3010 -       {0x0000a56c, 0x7702b08c, 0x7702b08c, 0x5d001eec, 0x5d001eec},
3011 -       {0x0000a570, 0x7702b08c, 0x7702b08c, 0x5d001eec, 0x5d001eec},
3012 -       {0x0000a574, 0x7702b08c, 0x7702b08c, 0x5d001eec, 0x5d001eec},
3013 -       {0x0000a578, 0x7702b08c, 0x7702b08c, 0x5d001eec, 0x5d001eec},
3014 -       {0x0000a57c, 0x7702b08c, 0x7702b08c, 0x5d001eec, 0x5d001eec},
3015 -       {0x0000a580, 0x00800000, 0x00800000, 0x00800000, 0x00800000},
3016 -       {0x0000a584, 0x06800003, 0x06800003, 0x04800002, 0x04800002},
3017 -       {0x0000a588, 0x0a800020, 0x0a800020, 0x08800004, 0x08800004},
3018 -       {0x0000a58c, 0x10800023, 0x10800023, 0x0b800200, 0x0b800200},
3019 -       {0x0000a590, 0x16800220, 0x16800220, 0x0f800202, 0x0f800202},
3020 -       {0x0000a594, 0x1c800223, 0x1c800223, 0x12800400, 0x12800400},
3021 -       {0x0000a598, 0x21802220, 0x21802220, 0x16800402, 0x16800402},
3022 -       {0x0000a59c, 0x27802223, 0x27802223, 0x19800404, 0x19800404},
3023 -       {0x0000a5a0, 0x2b822220, 0x2b822220, 0x1c800603, 0x1c800603},
3024 -       {0x0000a5a4, 0x2f822222, 0x2f822222, 0x21800a02, 0x21800a02},
3025 -       {0x0000a5a8, 0x34822225, 0x34822225, 0x25800a04, 0x25800a04},
3026 -       {0x0000a5ac, 0x3a82222a, 0x3a82222a, 0x28800a20, 0x28800a20},
3027 -       {0x0000a5b0, 0x3e82222c, 0x3e82222c, 0x2c800e20, 0x2c800e20},
3028 -       {0x0000a5b4, 0x4282242a, 0x4282242a, 0x30800e22, 0x30800e22},
3029 -       {0x0000a5b8, 0x4782244a, 0x4782244a, 0x34800e24, 0x34800e24},
3030 -       {0x0000a5bc, 0x4b82244c, 0x4b82244c, 0x38801640, 0x38801640},
3031 -       {0x0000a5c0, 0x4e82246c, 0x4e82246c, 0x3c801660, 0x3c801660},
3032 -       {0x0000a5c4, 0x5382266c, 0x5382266c, 0x3f801861, 0x3f801861},
3033 -       {0x0000a5c8, 0x5782286c, 0x5782286c, 0x43801a81, 0x43801a81},
3034 -       {0x0000a5cc, 0x5c82486b, 0x5c82486b, 0x47801a83, 0x47801a83},
3035 -       {0x0000a5d0, 0x61824a6c, 0x61824a6c, 0x4a801c84, 0x4a801c84},
3036 -       {0x0000a5d4, 0x66826a6c, 0x66826a6c, 0x4e801ce3, 0x4e801ce3},
3037 -       {0x0000a5d8, 0x6b826e6c, 0x6b826e6c, 0x52801ce5, 0x52801ce5},
3038 -       {0x0000a5dc, 0x7082708c, 0x7082708c, 0x56801ce9, 0x56801ce9},
3039 -       {0x0000a5e0, 0x7382b08a, 0x7382b08a, 0x5a801ceb, 0x5a801ceb},
3040 -       {0x0000a5e4, 0x7782b08c, 0x7782b08c, 0x5d801eec, 0x5d801eec},
3041 -       {0x0000a5e8, 0x7782b08c, 0x7782b08c, 0x5d801eec, 0x5d801eec},
3042 -       {0x0000a5ec, 0x7782b08c, 0x7782b08c, 0x5d801eec, 0x5d801eec},
3043 -       {0x0000a5f0, 0x7782b08c, 0x7782b08c, 0x5d801eec, 0x5d801eec},
3044 -       {0x0000a5f4, 0x7782b08c, 0x7782b08c, 0x5d801eec, 0x5d801eec},
3045 -       {0x0000a5f8, 0x7782b08c, 0x7782b08c, 0x5d801eec, 0x5d801eec},
3046 -       {0x0000a5fc, 0x7782b08c, 0x7782b08c, 0x5d801eec, 0x5d801eec},
3047 -       {0x0000a600, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
3048 -       {0x0000a604, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
3049 -       {0x0000a608, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
3050 -       {0x0000a60c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
3051 -       {0x0000a610, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
3052 -       {0x0000a614, 0x01404000, 0x01404000, 0x01404000, 0x01404000},
3053 -       {0x0000a618, 0x01404501, 0x01404501, 0x01404501, 0x01404501},
3054 -       {0x0000a61c, 0x02008802, 0x02008802, 0x02008501, 0x02008501},
3055 -       {0x0000a620, 0x0300cc03, 0x0300cc03, 0x0280ca03, 0x0280ca03},
3056 -       {0x0000a624, 0x0300cc03, 0x0300cc03, 0x03010c04, 0x03010c04},
3057 -       {0x0000a628, 0x0300cc03, 0x0300cc03, 0x04014c04, 0x04014c04},
3058 -       {0x0000a62c, 0x03810c03, 0x03810c03, 0x04015005, 0x04015005},
3059 -       {0x0000a630, 0x03810e04, 0x03810e04, 0x04015005, 0x04015005},
3060 -       {0x0000a634, 0x03810e04, 0x03810e04, 0x04015005, 0x04015005},
3061 -       {0x0000a638, 0x03810e04, 0x03810e04, 0x04015005, 0x04015005},
3062 -       {0x0000a63c, 0x03810e04, 0x03810e04, 0x04015005, 0x04015005},
3063 -       {0x0000b2dc, 0x0380c7fc, 0x0380c7fc, 0x03aaa352, 0x03aaa352},
3064 -       {0x0000b2e0, 0x0000f800, 0x0000f800, 0x03ccc584, 0x03ccc584},
3065 -       {0x0000b2e4, 0x03ff0000, 0x03ff0000, 0x03f0f800, 0x03f0f800},
3066 -       {0x0000b2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
3067 -       {0x0000c2dc, 0x0380c7fc, 0x0380c7fc, 0x03aaa352, 0x03aaa352},
3068 -       {0x0000c2e0, 0x0000f800, 0x0000f800, 0x03ccc584, 0x03ccc584},
3069 -       {0x0000c2e4, 0x03ff0000, 0x03ff0000, 0x03f0f800, 0x03f0f800},
3070 -       {0x0000c2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
3071 -       {0x00016044, 0x012492d4, 0x012492d4, 0x012492d4, 0x012492d4},
3072 -       {0x00016048, 0x66480001, 0x66480001, 0x66480001, 0x66480001},
3073 -       {0x00016068, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
3074 -       {0x00016444, 0x012492d4, 0x012492d4, 0x012492d4, 0x012492d4},
3075 -       {0x00016448, 0x66480001, 0x66480001, 0x66480001, 0x66480001},
3076 -       {0x00016468, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
3077 -       {0x00016844, 0x012492d4, 0x012492d4, 0x012492d4, 0x012492d4},
3078 -       {0x00016848, 0x66480001, 0x66480001, 0x66480001, 0x66480001},
3079 -       {0x00016868, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
3080 -};
3081 +#define ar9580_1p0_high_power_tx_gain_table ar9580_1p0_low_ob_db_tx_gain_table
3082
3083  static const u32 ar9580_1p0_lowest_ob_db_tx_gain_table[][5] = {
3084         /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
3085 @@ -538,12 +414,7 @@ static const u32 ar9580_1p0_lowest_ob_db
3086         {0x00016868, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
3087  };
3088
3089 -static const u32 ar9580_1p0_baseband_core_txfir_coeff_japan_2484[][2] = {
3090 -       /* Addr      allmodes  */
3091 -       {0x0000a398, 0x00000000},
3092 -       {0x0000a39c, 0x6f7f0301},
3093 -       {0x0000a3a0, 0xca9228ee},
3094 -};
3095 +#define ar9580_1p0_baseband_core_txfir_coeff_japan_2484 ar9462_2p0_baseband_core_txfir_coeff_japan_2484
3096
3097  static const u32 ar9580_1p0_mac_core[][2] = {
3098         /* Addr      allmodes  */
3099 @@ -808,376 +679,11 @@ static const u32 ar9580_1p0_mixed_ob_db_
3100         {0x00016868, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
3101  };
3102
3103 -static const u32 ar9580_1p0_wo_xlna_rx_gain_table[][2] = {
3104 -       /* Addr      allmodes  */
3105 -       {0x0000a000, 0x00010000},
3106 -       {0x0000a004, 0x00030002},
3107 -       {0x0000a008, 0x00050004},
3108 -       {0x0000a00c, 0x00810080},
3109 -       {0x0000a010, 0x00830082},
3110 -       {0x0000a014, 0x01810180},
3111 -       {0x0000a018, 0x01830182},
3112 -       {0x0000a01c, 0x01850184},
3113 -       {0x0000a020, 0x01890188},
3114 -       {0x0000a024, 0x018b018a},
3115 -       {0x0000a028, 0x018d018c},
3116 -       {0x0000a02c, 0x03820190},
3117 -       {0x0000a030, 0x03840383},
3118 -       {0x0000a034, 0x03880385},
3119 -       {0x0000a038, 0x038a0389},
3120 -       {0x0000a03c, 0x038c038b},
3121 -       {0x0000a040, 0x0390038d},
3122 -       {0x0000a044, 0x03920391},
3123 -       {0x0000a048, 0x03940393},
3124 -       {0x0000a04c, 0x03960395},
3125 -       {0x0000a050, 0x00000000},
3126 -       {0x0000a054, 0x00000000},
3127 -       {0x0000a058, 0x00000000},
3128 -       {0x0000a05c, 0x00000000},
3129 -       {0x0000a060, 0x00000000},
3130 -       {0x0000a064, 0x00000000},
3131 -       {0x0000a068, 0x00000000},
3132 -       {0x0000a06c, 0x00000000},
3133 -       {0x0000a070, 0x00000000},
3134 -       {0x0000a074, 0x00000000},
3135 -       {0x0000a078, 0x00000000},
3136 -       {0x0000a07c, 0x00000000},
3137 -       {0x0000a080, 0x29292929},
3138 -       {0x0000a084, 0x29292929},
3139 -       {0x0000a088, 0x29292929},
3140 -       {0x0000a08c, 0x29292929},
3141 -       {0x0000a090, 0x22292929},
3142 -       {0x0000a094, 0x1d1d2222},
3143 -       {0x0000a098, 0x0c111117},
3144 -       {0x0000a09c, 0x00030303},
3145 -       {0x0000a0a0, 0x00000000},
3146 -       {0x0000a0a4, 0x00000000},
3147 -       {0x0000a0a8, 0x00000000},
3148 -       {0x0000a0ac, 0x00000000},
3149 -       {0x0000a0b0, 0x00000000},
3150 -       {0x0000a0b4, 0x00000000},
3151 -       {0x0000a0b8, 0x00000000},
3152 -       {0x0000a0bc, 0x00000000},
3153 -       {0x0000a0c0, 0x001f0000},
3154 -       {0x0000a0c4, 0x01000101},
3155 -       {0x0000a0c8, 0x011e011f},
3156 -       {0x0000a0cc, 0x011c011d},
3157 -       {0x0000a0d0, 0x02030204},
3158 -       {0x0000a0d4, 0x02010202},
3159 -       {0x0000a0d8, 0x021f0200},
3160 -       {0x0000a0dc, 0x0302021e},
3161 -       {0x0000a0e0, 0x03000301},
3162 -       {0x0000a0e4, 0x031e031f},
3163 -       {0x0000a0e8, 0x0402031d},
3164 -       {0x0000a0ec, 0x04000401},
3165 -       {0x0000a0f0, 0x041e041f},
3166 -       {0x0000a0f4, 0x0502041d},
3167 -       {0x0000a0f8, 0x05000501},
3168 -       {0x0000a0fc, 0x051e051f},
3169 -       {0x0000a100, 0x06010602},
3170 -       {0x0000a104, 0x061f0600},
3171 -       {0x0000a108, 0x061d061e},
3172 -       {0x0000a10c, 0x07020703},
3173 -       {0x0000a110, 0x07000701},
3174 -       {0x0000a114, 0x00000000},
3175 -       {0x0000a118, 0x00000000},
3176 -       {0x0000a11c, 0x00000000},
3177 -       {0x0000a120, 0x00000000},
3178 -       {0x0000a124, 0x00000000},
3179 -       {0x0000a128, 0x00000000},
3180 -       {0x0000a12c, 0x00000000},
3181 -       {0x0000a130, 0x00000000},
3182 -       {0x0000a134, 0x00000000},
3183 -       {0x0000a138, 0x00000000},
3184 -       {0x0000a13c, 0x00000000},
3185 -       {0x0000a140, 0x001f0000},
3186 -       {0x0000a144, 0x01000101},
3187 -       {0x0000a148, 0x011e011f},
3188 -       {0x0000a14c, 0x011c011d},
3189 -       {0x0000a150, 0x02030204},
3190 -       {0x0000a154, 0x02010202},
3191 -       {0x0000a158, 0x021f0200},
3192 -       {0x0000a15c, 0x0302021e},
3193 -       {0x0000a160, 0x03000301},
3194 -       {0x0000a164, 0x031e031f},
3195 -       {0x0000a168, 0x0402031d},
3196 -       {0x0000a16c, 0x04000401},
3197 -       {0x0000a170, 0x041e041f},
3198 -       {0x0000a174, 0x0502041d},
3199 -       {0x0000a178, 0x05000501},
3200 -       {0x0000a17c, 0x051e051f},
3201 -       {0x0000a180, 0x06010602},
3202 -       {0x0000a184, 0x061f0600},
3203 -       {0x0000a188, 0x061d061e},
3204 -       {0x0000a18c, 0x07020703},
3205 -       {0x0000a190, 0x07000701},
3206 -       {0x0000a194, 0x00000000},
3207 -       {0x0000a198, 0x00000000},
3208 -       {0x0000a19c, 0x00000000},
3209 -       {0x0000a1a0, 0x00000000},
3210 -       {0x0000a1a4, 0x00000000},
3211 -       {0x0000a1a8, 0x00000000},
3212 -       {0x0000a1ac, 0x00000000},
3213 -       {0x0000a1b0, 0x00000000},
3214 -       {0x0000a1b4, 0x00000000},
3215 -       {0x0000a1b8, 0x00000000},
3216 -       {0x0000a1bc, 0x00000000},
3217 -       {0x0000a1c0, 0x00000000},
3218 -       {0x0000a1c4, 0x00000000},
3219 -       {0x0000a1c8, 0x00000000},
3220 -       {0x0000a1cc, 0x00000000},
3221 -       {0x0000a1d0, 0x00000000},
3222 -       {0x0000a1d4, 0x00000000},
3223 -       {0x0000a1d8, 0x00000000},
3224 -       {0x0000a1dc, 0x00000000},
3225 -       {0x0000a1e0, 0x00000000},
3226 -       {0x0000a1e4, 0x00000000},
3227 -       {0x0000a1e8, 0x00000000},
3228 -       {0x0000a1ec, 0x00000000},
3229 -       {0x0000a1f0, 0x00000396},
3230 -       {0x0000a1f4, 0x00000396},
3231 -       {0x0000a1f8, 0x00000396},
3232 -       {0x0000a1fc, 0x00000196},
3233 -       {0x0000b000, 0x00010000},
3234 -       {0x0000b004, 0x00030002},
3235 -       {0x0000b008, 0x00050004},
3236 -       {0x0000b00c, 0x00810080},
3237 -       {0x0000b010, 0x00830082},
3238 -       {0x0000b014, 0x01810180},
3239 -       {0x0000b018, 0x01830182},
3240 -       {0x0000b01c, 0x01850184},
3241 -       {0x0000b020, 0x02810280},
3242 -       {0x0000b024, 0x02830282},
3243 -       {0x0000b028, 0x02850284},
3244 -       {0x0000b02c, 0x02890288},
3245 -       {0x0000b030, 0x028b028a},
3246 -       {0x0000b034, 0x0388028c},
3247 -       {0x0000b038, 0x038a0389},
3248 -       {0x0000b03c, 0x038c038b},
3249 -       {0x0000b040, 0x0390038d},
3250 -       {0x0000b044, 0x03920391},
3251 -       {0x0000b048, 0x03940393},
3252 -       {0x0000b04c, 0x03960395},
3253 -       {0x0000b050, 0x00000000},
3254 -       {0x0000b054, 0x00000000},
3255 -       {0x0000b058, 0x00000000},
3256 -       {0x0000b05c, 0x00000000},
3257 -       {0x0000b060, 0x00000000},
3258 -       {0x0000b064, 0x00000000},
3259 -       {0x0000b068, 0x00000000},
3260 -       {0x0000b06c, 0x00000000},
3261 -       {0x0000b070, 0x00000000},
3262 -       {0x0000b074, 0x00000000},
3263 -       {0x0000b078, 0x00000000},
3264 -       {0x0000b07c, 0x00000000},
3265 -       {0x0000b080, 0x32323232},
3266 -       {0x0000b084, 0x2f2f3232},
3267 -       {0x0000b088, 0x23282a2d},
3268 -       {0x0000b08c, 0x1c1e2123},
3269 -       {0x0000b090, 0x14171919},
3270 -       {0x0000b094, 0x0e0e1214},
3271 -       {0x0000b098, 0x03050707},
3272 -       {0x0000b09c, 0x00030303},
3273 -       {0x0000b0a0, 0x00000000},
3274 -       {0x0000b0a4, 0x00000000},
3275 -       {0x0000b0a8, 0x00000000},
3276 -       {0x0000b0ac, 0x00000000},
3277 -       {0x0000b0b0, 0x00000000},
3278 -       {0x0000b0b4, 0x00000000},
3279 -       {0x0000b0b8, 0x00000000},
3280 -       {0x0000b0bc, 0x00000000},
3281 -       {0x0000b0c0, 0x003f0020},
3282 -       {0x0000b0c4, 0x00400041},
3283 -       {0x0000b0c8, 0x0140005f},
3284 -       {0x0000b0cc, 0x0160015f},
3285 -       {0x0000b0d0, 0x017e017f},
3286 -       {0x0000b0d4, 0x02410242},
3287 -       {0x0000b0d8, 0x025f0240},
3288 -       {0x0000b0dc, 0x027f0260},
3289 -       {0x0000b0e0, 0x0341027e},
3290 -       {0x0000b0e4, 0x035f0340},
3291 -       {0x0000b0e8, 0x037f0360},
3292 -       {0x0000b0ec, 0x04400441},
3293 -       {0x0000b0f0, 0x0460045f},
3294 -       {0x0000b0f4, 0x0541047f},
3295 -       {0x0000b0f8, 0x055f0540},
3296 -       {0x0000b0fc, 0x057f0560},
3297 -       {0x0000b100, 0x06400641},
3298 -       {0x0000b104, 0x0660065f},
3299 -       {0x0000b108, 0x067e067f},
3300 -       {0x0000b10c, 0x07410742},
3301 -       {0x0000b110, 0x075f0740},
3302 -       {0x0000b114, 0x077f0760},
3303 -       {0x0000b118, 0x07800781},
3304 -       {0x0000b11c, 0x07a0079f},
3305 -       {0x0000b120, 0x07c107bf},
3306 -       {0x0000b124, 0x000007c0},
3307 -       {0x0000b128, 0x00000000},
3308 -       {0x0000b12c, 0x00000000},
3309 -       {0x0000b130, 0x00000000},
3310 -       {0x0000b134, 0x00000000},
3311 -       {0x0000b138, 0x00000000},
3312 -       {0x0000b13c, 0x00000000},
3313 -       {0x0000b140, 0x003f0020},
3314 -       {0x0000b144, 0x00400041},
3315 -       {0x0000b148, 0x0140005f},
3316 -       {0x0000b14c, 0x0160015f},
3317 -       {0x0000b150, 0x017e017f},
3318 -       {0x0000b154, 0x02410242},
3319 -       {0x0000b158, 0x025f0240},
3320 -       {0x0000b15c, 0x027f0260},
3321 -       {0x0000b160, 0x0341027e},
3322 -       {0x0000b164, 0x035f0340},
3323 -       {0x0000b168, 0x037f0360},
3324 -       {0x0000b16c, 0x04400441},
3325 -       {0x0000b170, 0x0460045f},
3326 -       {0x0000b174, 0x0541047f},
3327 -       {0x0000b178, 0x055f0540},
3328 -       {0x0000b17c, 0x057f0560},
3329 -       {0x0000b180, 0x06400641},
3330 -       {0x0000b184, 0x0660065f},
3331 -       {0x0000b188, 0x067e067f},
3332 -       {0x0000b18c, 0x07410742},
3333 -       {0x0000b190, 0x075f0740},
3334 -       {0x0000b194, 0x077f0760},
3335 -       {0x0000b198, 0x07800781},
3336 -       {0x0000b19c, 0x07a0079f},
3337 -       {0x0000b1a0, 0x07c107bf},
3338 -       {0x0000b1a4, 0x000007c0},
3339 -       {0x0000b1a8, 0x00000000},
3340 -       {0x0000b1ac, 0x00000000},
3341 -       {0x0000b1b0, 0x00000000},
3342 -       {0x0000b1b4, 0x00000000},
3343 -       {0x0000b1b8, 0x00000000},
3344 -       {0x0000b1bc, 0x00000000},
3345 -       {0x0000b1c0, 0x00000000},
3346 -       {0x0000b1c4, 0x00000000},
3347 -       {0x0000b1c8, 0x00000000},
3348 -       {0x0000b1cc, 0x00000000},
3349 -       {0x0000b1d0, 0x00000000},
3350 -       {0x0000b1d4, 0x00000000},
3351 -       {0x0000b1d8, 0x00000000},
3352 -       {0x0000b1dc, 0x00000000},
3353 -       {0x0000b1e0, 0x00000000},
3354 -       {0x0000b1e4, 0x00000000},
3355 -       {0x0000b1e8, 0x00000000},
3356 -       {0x0000b1ec, 0x00000000},
3357 -       {0x0000b1f0, 0x00000396},
3358 -       {0x0000b1f4, 0x00000396},
3359 -       {0x0000b1f8, 0x00000396},
3360 -       {0x0000b1fc, 0x00000196},
3361 -};
3362 +#define ar9580_1p0_wo_xlna_rx_gain_table ar9300Common_wo_xlna_rx_gain_table_2p2
3363
3364 -static const u32 ar9580_1p0_soc_postamble[][5] = {
3365 -       /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
3366 -       {0x00007010, 0x00000023, 0x00000023, 0x00000023, 0x00000023},
3367 -};
3368 +#define ar9580_1p0_soc_postamble ar9300_2p2_soc_postamble
3369
3370 -static const u32 ar9580_1p0_high_ob_db_tx_gain_table[][5] = {
3371 -       /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
3372 -       {0x0000a2dc, 0x01feee00, 0x01feee00, 0x03aaa352, 0x03aaa352},
3373 -       {0x0000a2e0, 0x0000f000, 0x0000f000, 0x03ccc584, 0x03ccc584},
3374 -       {0x0000a2e4, 0x01ff0000, 0x01ff0000, 0x03f0f800, 0x03f0f800},
3375 -       {0x0000a2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
3376 -       {0x0000a410, 0x000050d8, 0x000050d8, 0x000050d9, 0x000050d9},
3377 -       {0x0000a500, 0x00002220, 0x00002220, 0x00000000, 0x00000000},
3378 -       {0x0000a504, 0x04002222, 0x04002222, 0x04000002, 0x04000002},
3379 -       {0x0000a508, 0x09002421, 0x09002421, 0x08000004, 0x08000004},
3380 -       {0x0000a50c, 0x0d002621, 0x0d002621, 0x0b000200, 0x0b000200},
3381 -       {0x0000a510, 0x13004620, 0x13004620, 0x0f000202, 0x0f000202},
3382 -       {0x0000a514, 0x19004a20, 0x19004a20, 0x11000400, 0x11000400},
3383 -       {0x0000a518, 0x1d004e20, 0x1d004e20, 0x15000402, 0x15000402},
3384 -       {0x0000a51c, 0x21005420, 0x21005420, 0x19000404, 0x19000404},
3385 -       {0x0000a520, 0x26005e20, 0x26005e20, 0x1b000603, 0x1b000603},
3386 -       {0x0000a524, 0x2b005e40, 0x2b005e40, 0x1f000a02, 0x1f000a02},
3387 -       {0x0000a528, 0x2f005e42, 0x2f005e42, 0x23000a04, 0x23000a04},
3388 -       {0x0000a52c, 0x33005e44, 0x33005e44, 0x26000a20, 0x26000a20},
3389 -       {0x0000a530, 0x38005e65, 0x38005e65, 0x2a000e20, 0x2a000e20},
3390 -       {0x0000a534, 0x3c005e69, 0x3c005e69, 0x2e000e22, 0x2e000e22},
3391 -       {0x0000a538, 0x40005e6b, 0x40005e6b, 0x31000e24, 0x31000e24},
3392 -       {0x0000a53c, 0x44005e6d, 0x44005e6d, 0x34001640, 0x34001640},
3393 -       {0x0000a540, 0x49005e72, 0x49005e72, 0x38001660, 0x38001660},
3394 -       {0x0000a544, 0x4e005eb2, 0x4e005eb2, 0x3b001861, 0x3b001861},
3395 -       {0x0000a548, 0x53005f12, 0x53005f12, 0x3e001a81, 0x3e001a81},
3396 -       {0x0000a54c, 0x59025eb2, 0x59025eb2, 0x42001a83, 0x42001a83},
3397 -       {0x0000a550, 0x5e025f12, 0x5e025f12, 0x44001c84, 0x44001c84},
3398 -       {0x0000a554, 0x61027f12, 0x61027f12, 0x48001ce3, 0x48001ce3},
3399 -       {0x0000a558, 0x6702bf12, 0x6702bf12, 0x4c001ce5, 0x4c001ce5},
3400 -       {0x0000a55c, 0x6b02bf14, 0x6b02bf14, 0x50001ce9, 0x50001ce9},
3401 -       {0x0000a560, 0x6f02bf16, 0x6f02bf16, 0x54001ceb, 0x54001ceb},
3402 -       {0x0000a564, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
3403 -       {0x0000a568, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
3404 -       {0x0000a56c, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
3405 -       {0x0000a570, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
3406 -       {0x0000a574, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
3407 -       {0x0000a578, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
3408 -       {0x0000a57c, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
3409 -       {0x0000a580, 0x00802220, 0x00802220, 0x00800000, 0x00800000},
3410 -       {0x0000a584, 0x04802222, 0x04802222, 0x04800002, 0x04800002},
3411 -       {0x0000a588, 0x09802421, 0x09802421, 0x08800004, 0x08800004},
3412 -       {0x0000a58c, 0x0d802621, 0x0d802621, 0x0b800200, 0x0b800200},
3413 -       {0x0000a590, 0x13804620, 0x13804620, 0x0f800202, 0x0f800202},
3414 -       {0x0000a594, 0x19804a20, 0x19804a20, 0x11800400, 0x11800400},
3415 -       {0x0000a598, 0x1d804e20, 0x1d804e20, 0x15800402, 0x15800402},
3416 -       {0x0000a59c, 0x21805420, 0x21805420, 0x19800404, 0x19800404},
3417 -       {0x0000a5a0, 0x26805e20, 0x26805e20, 0x1b800603, 0x1b800603},
3418 -       {0x0000a5a4, 0x2b805e40, 0x2b805e40, 0x1f800a02, 0x1f800a02},
3419 -       {0x0000a5a8, 0x2f805e42, 0x2f805e42, 0x23800a04, 0x23800a04},
3420 -       {0x0000a5ac, 0x33805e44, 0x33805e44, 0x26800a20, 0x26800a20},
3421 -       {0x0000a5b0, 0x38805e65, 0x38805e65, 0x2a800e20, 0x2a800e20},
3422 -       {0x0000a5b4, 0x3c805e69, 0x3c805e69, 0x2e800e22, 0x2e800e22},
3423 -       {0x0000a5b8, 0x40805e6b, 0x40805e6b, 0x31800e24, 0x31800e24},
3424 -       {0x0000a5bc, 0x44805e6d, 0x44805e6d, 0x34801640, 0x34801640},
3425 -       {0x0000a5c0, 0x49805e72, 0x49805e72, 0x38801660, 0x38801660},
3426 -       {0x0000a5c4, 0x4e805eb2, 0x4e805eb2, 0x3b801861, 0x3b801861},
3427 -       {0x0000a5c8, 0x53805f12, 0x53805f12, 0x3e801a81, 0x3e801a81},
3428 -       {0x0000a5cc, 0x59825eb2, 0x59825eb2, 0x42801a83, 0x42801a83},
3429 -       {0x0000a5d0, 0x5e825f12, 0x5e825f12, 0x44801c84, 0x44801c84},
3430 -       {0x0000a5d4, 0x61827f12, 0x61827f12, 0x48801ce3, 0x48801ce3},
3431 -       {0x0000a5d8, 0x6782bf12, 0x6782bf12, 0x4c801ce5, 0x4c801ce5},
3432 -       {0x0000a5dc, 0x6b82bf14, 0x6b82bf14, 0x50801ce9, 0x50801ce9},
3433 -       {0x0000a5e0, 0x6f82bf16, 0x6f82bf16, 0x54801ceb, 0x54801ceb},
3434 -       {0x0000a5e4, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
3435 -       {0x0000a5e8, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
3436 -       {0x0000a5ec, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
3437 -       {0x0000a5f0, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
3438 -       {0x0000a5f4, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
3439 -       {0x0000a5f8, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
3440 -       {0x0000a5fc, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
3441 -       {0x0000a600, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
3442 -       {0x0000a604, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
3443 -       {0x0000a608, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
3444 -       {0x0000a60c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
3445 -       {0x0000a610, 0x00804000, 0x00804000, 0x00000000, 0x00000000},
3446 -       {0x0000a614, 0x00804201, 0x00804201, 0x01404000, 0x01404000},
3447 -       {0x0000a618, 0x0280c802, 0x0280c802, 0x01404501, 0x01404501},
3448 -       {0x0000a61c, 0x0280ca03, 0x0280ca03, 0x02008501, 0x02008501},
3449 -       {0x0000a620, 0x04c15104, 0x04c15104, 0x0280ca03, 0x0280ca03},
3450 -       {0x0000a624, 0x04c15305, 0x04c15305, 0x03010c04, 0x03010c04},
3451 -       {0x0000a628, 0x04c15305, 0x04c15305, 0x04014c04, 0x04014c04},
3452 -       {0x0000a62c, 0x04c15305, 0x04c15305, 0x04015005, 0x04015005},
3453 -       {0x0000a630, 0x04c15305, 0x04c15305, 0x04015005, 0x04015005},
3454 -       {0x0000a634, 0x04c15305, 0x04c15305, 0x04015005, 0x04015005},
3455 -       {0x0000a638, 0x04c15305, 0x04c15305, 0x04015005, 0x04015005},
3456 -       {0x0000a63c, 0x04c15305, 0x04c15305, 0x04015005, 0x04015005},
3457 -       {0x0000b2dc, 0x01feee00, 0x01feee00, 0x03aaa352, 0x03aaa352},
3458 -       {0x0000b2e0, 0x0000f000, 0x0000f000, 0x03ccc584, 0x03ccc584},
3459 -       {0x0000b2e4, 0x01ff0000, 0x01ff0000, 0x03f0f800, 0x03f0f800},
3460 -       {0x0000b2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
3461 -       {0x0000c2dc, 0x01feee00, 0x01feee00, 0x03aaa352, 0x03aaa352},
3462 -       {0x0000c2e0, 0x0000f000, 0x0000f000, 0x03ccc584, 0x03ccc584},
3463 -       {0x0000c2e4, 0x01ff0000, 0x01ff0000, 0x03f0f800, 0x03f0f800},
3464 -       {0x0000c2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
3465 -       {0x00016044, 0x056db2e4, 0x056db2e4, 0x056db2e4, 0x056db2e4},
3466 -       {0x00016048, 0x8e480001, 0x8e480001, 0x8e480001, 0x8e480001},
3467 -       {0x00016068, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
3468 -       {0x00016444, 0x056db2e4, 0x056db2e4, 0x056db2e4, 0x056db2e4},
3469 -       {0x00016448, 0x8e480001, 0x8e480001, 0x8e480001, 0x8e480001},
3470 -       {0x00016468, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
3471 -       {0x00016844, 0x056db2e4, 0x056db2e4, 0x056db2e4, 0x056db2e4},
3472 -       {0x00016848, 0x8e480001, 0x8e480001, 0x8e480001, 0x8e480001},
3473 -       {0x00016868, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
3474 -};
3475 +#define ar9580_1p0_high_ob_db_tx_gain_table ar9300Modes_high_ob_db_tx_gain_table_2p2
3476
3477  static const u32 ar9580_1p0_soc_preamble[][2] = {
3478         /* Addr      allmodes  */
3479 @@ -1189,265 +695,7 @@ static const u32 ar9580_1p0_soc_preamble
3480         {0x00007048, 0x00000008},
3481  };
3482
3483 -static const u32 ar9580_1p0_rx_gain_table[][2] = {
3484 -       /* Addr      allmodes  */
3485 -       {0x0000a000, 0x00010000},
3486 -       {0x0000a004, 0x00030002},
3487 -       {0x0000a008, 0x00050004},
3488 -       {0x0000a00c, 0x00810080},
3489 -       {0x0000a010, 0x00830082},
3490 -       {0x0000a014, 0x01810180},
3491 -       {0x0000a018, 0x01830182},
3492 -       {0x0000a01c, 0x01850184},
3493 -       {0x0000a020, 0x01890188},
3494 -       {0x0000a024, 0x018b018a},
3495 -       {0x0000a028, 0x018d018c},
3496 -       {0x0000a02c, 0x01910190},
3497 -       {0x0000a030, 0x01930192},
3498 -       {0x0000a034, 0x01950194},
3499 -       {0x0000a038, 0x038a0196},
3500 -       {0x0000a03c, 0x038c038b},
3501 -       {0x0000a040, 0x0390038d},
3502 -       {0x0000a044, 0x03920391},
3503 -       {0x0000a048, 0x03940393},
3504 -       {0x0000a04c, 0x03960395},
3505 -       {0x0000a050, 0x00000000},
3506 -       {0x0000a054, 0x00000000},
3507 -       {0x0000a058, 0x00000000},
3508 -       {0x0000a05c, 0x00000000},
3509 -       {0x0000a060, 0x00000000},
3510 -       {0x0000a064, 0x00000000},
3511 -       {0x0000a068, 0x00000000},
3512 -       {0x0000a06c, 0x00000000},
3513 -       {0x0000a070, 0x00000000},
3514 -       {0x0000a074, 0x00000000},
3515 -       {0x0000a078, 0x00000000},
3516 -       {0x0000a07c, 0x00000000},
3517 -       {0x0000a080, 0x22222229},
3518 -       {0x0000a084, 0x1d1d1d1d},
3519 -       {0x0000a088, 0x1d1d1d1d},
3520 -       {0x0000a08c, 0x1d1d1d1d},
3521 -       {0x0000a090, 0x171d1d1d},
3522 -       {0x0000a094, 0x11111717},
3523 -       {0x0000a098, 0x00030311},
3524 -       {0x0000a09c, 0x00000000},
3525 -       {0x0000a0a0, 0x00000000},
3526 -       {0x0000a0a4, 0x00000000},
3527 -       {0x0000a0a8, 0x00000000},
3528 -       {0x0000a0ac, 0x00000000},
3529 -       {0x0000a0b0, 0x00000000},
3530 -       {0x0000a0b4, 0x00000000},
3531 -       {0x0000a0b8, 0x00000000},
3532 -       {0x0000a0bc, 0x00000000},
3533 -       {0x0000a0c0, 0x001f0000},
3534 -       {0x0000a0c4, 0x01000101},
3535 -       {0x0000a0c8, 0x011e011f},
3536 -       {0x0000a0cc, 0x011c011d},
3537 -       {0x0000a0d0, 0x02030204},
3538 -       {0x0000a0d4, 0x02010202},
3539 -       {0x0000a0d8, 0x021f0200},
3540 -       {0x0000a0dc, 0x0302021e},
3541 -       {0x0000a0e0, 0x03000301},
3542 -       {0x0000a0e4, 0x031e031f},
3543 -       {0x0000a0e8, 0x0402031d},
3544 -       {0x0000a0ec, 0x04000401},
3545 -       {0x0000a0f0, 0x041e041f},
3546 -       {0x0000a0f4, 0x0502041d},
3547 -       {0x0000a0f8, 0x05000501},
3548 -       {0x0000a0fc, 0x051e051f},
3549 -       {0x0000a100, 0x06010602},
3550 -       {0x0000a104, 0x061f0600},
3551 -       {0x0000a108, 0x061d061e},
3552 -       {0x0000a10c, 0x07020703},
3553 -       {0x0000a110, 0x07000701},
3554 -       {0x0000a114, 0x00000000},
3555 -       {0x0000a118, 0x00000000},
3556 -       {0x0000a11c, 0x00000000},
3557 -       {0x0000a120, 0x00000000},
3558 -       {0x0000a124, 0x00000000},
3559 -       {0x0000a128, 0x00000000},
3560 -       {0x0000a12c, 0x00000000},
3561 -       {0x0000a130, 0x00000000},
3562 -       {0x0000a134, 0x00000000},
3563 -       {0x0000a138, 0x00000000},
3564 -       {0x0000a13c, 0x00000000},
3565 -       {0x0000a140, 0x001f0000},
3566 -       {0x0000a144, 0x01000101},
3567 -       {0x0000a148, 0x011e011f},
3568 -       {0x0000a14c, 0x011c011d},
3569 -       {0x0000a150, 0x02030204},
3570 -       {0x0000a154, 0x02010202},
3571 -       {0x0000a158, 0x021f0200},
3572 -       {0x0000a15c, 0x0302021e},
3573 -       {0x0000a160, 0x03000301},
3574 -       {0x0000a164, 0x031e031f},
3575 -       {0x0000a168, 0x0402031d},
3576 -       {0x0000a16c, 0x04000401},
3577 -       {0x0000a170, 0x041e041f},
3578 -       {0x0000a174, 0x0502041d},
3579 -       {0x0000a178, 0x05000501},
3580 -       {0x0000a17c, 0x051e051f},
3581 -       {0x0000a180, 0x06010602},
3582 -       {0x0000a184, 0x061f0600},
3583 -       {0x0000a188, 0x061d061e},
3584 -       {0x0000a18c, 0x07020703},
3585 -       {0x0000a190, 0x07000701},
3586 -       {0x0000a194, 0x00000000},
3587 -       {0x0000a198, 0x00000000},
3588 -       {0x0000a19c, 0x00000000},
3589 -       {0x0000a1a0, 0x00000000},
3590 -       {0x0000a1a4, 0x00000000},
3591 -       {0x0000a1a8, 0x00000000},
3592 -       {0x0000a1ac, 0x00000000},
3593 -       {0x0000a1b0, 0x00000000},
3594 -       {0x0000a1b4, 0x00000000},
3595 -       {0x0000a1b8, 0x00000000},
3596 -       {0x0000a1bc, 0x00000000},
3597 -       {0x0000a1c0, 0x00000000},
3598 -       {0x0000a1c4, 0x00000000},
3599 -       {0x0000a1c8, 0x00000000},
3600 -       {0x0000a1cc, 0x00000000},
3601 -       {0x0000a1d0, 0x00000000},
3602 -       {0x0000a1d4, 0x00000000},
3603 -       {0x0000a1d8, 0x00000000},
3604 -       {0x0000a1dc, 0x00000000},
3605 -       {0x0000a1e0, 0x00000000},
3606 -       {0x0000a1e4, 0x00000000},
3607 -       {0x0000a1e8, 0x00000000},
3608 -       {0x0000a1ec, 0x00000000},
3609 -       {0x0000a1f0, 0x00000396},
3610 -       {0x0000a1f4, 0x00000396},
3611 -       {0x0000a1f8, 0x00000396},
3612 -       {0x0000a1fc, 0x00000196},
3613 -       {0x0000b000, 0x00010000},
3614 -       {0x0000b004, 0x00030002},
3615 -       {0x0000b008, 0x00050004},
3616 -       {0x0000b00c, 0x00810080},
3617 -       {0x0000b010, 0x00830082},
3618 -       {0x0000b014, 0x01810180},
3619 -       {0x0000b018, 0x01830182},
3620 -       {0x0000b01c, 0x01850184},
3621 -       {0x0000b020, 0x02810280},
3622 -       {0x0000b024, 0x02830282},
3623 -       {0x0000b028, 0x02850284},
3624 -       {0x0000b02c, 0x02890288},
3625 -       {0x0000b030, 0x028b028a},
3626 -       {0x0000b034, 0x0388028c},
3627 -       {0x0000b038, 0x038a0389},
3628 -       {0x0000b03c, 0x038c038b},
3629 -       {0x0000b040, 0x0390038d},
3630 -       {0x0000b044, 0x03920391},
3631 -       {0x0000b048, 0x03940393},
3632 -       {0x0000b04c, 0x03960395},
3633 -       {0x0000b050, 0x00000000},
3634 -       {0x0000b054, 0x00000000},
3635 -       {0x0000b058, 0x00000000},
3636 -       {0x0000b05c, 0x00000000},
3637 -       {0x0000b060, 0x00000000},
3638 -       {0x0000b064, 0x00000000},
3639 -       {0x0000b068, 0x00000000},
3640 -       {0x0000b06c, 0x00000000},
3641 -       {0x0000b070, 0x00000000},
3642 -       {0x0000b074, 0x00000000},
3643 -       {0x0000b078, 0x00000000},
3644 -       {0x0000b07c, 0x00000000},
3645 -       {0x0000b080, 0x2a2d2f32},
3646 -       {0x0000b084, 0x21232328},
3647 -       {0x0000b088, 0x19191c1e},
3648 -       {0x0000b08c, 0x12141417},
3649 -       {0x0000b090, 0x07070e0e},
3650 -       {0x0000b094, 0x03030305},
3651 -       {0x0000b098, 0x00000003},
3652 -       {0x0000b09c, 0x00000000},
3653 -       {0x0000b0a0, 0x00000000},
3654 -       {0x0000b0a4, 0x00000000},
3655 -       {0x0000b0a8, 0x00000000},
3656 -       {0x0000b0ac, 0x00000000},
3657 -       {0x0000b0b0, 0x00000000},
3658 -       {0x0000b0b4, 0x00000000},
3659 -       {0x0000b0b8, 0x00000000},
3660 -       {0x0000b0bc, 0x00000000},
3661 -       {0x0000b0c0, 0x003f0020},
3662 -       {0x0000b0c4, 0x00400041},
3663 -       {0x0000b0c8, 0x0140005f},
3664 -       {0x0000b0cc, 0x0160015f},
3665 -       {0x0000b0d0, 0x017e017f},
3666 -       {0x0000b0d4, 0x02410242},
3667 -       {0x0000b0d8, 0x025f0240},
3668 -       {0x0000b0dc, 0x027f0260},
3669 -       {0x0000b0e0, 0x0341027e},
3670 -       {0x0000b0e4, 0x035f0340},
3671 -       {0x0000b0e8, 0x037f0360},
3672 -       {0x0000b0ec, 0x04400441},
3673 -       {0x0000b0f0, 0x0460045f},
3674 -       {0x0000b0f4, 0x0541047f},
3675 -       {0x0000b0f8, 0x055f0540},
3676 -       {0x0000b0fc, 0x057f0560},
3677 -       {0x0000b100, 0x06400641},
3678 -       {0x0000b104, 0x0660065f},
3679 -       {0x0000b108, 0x067e067f},
3680 -       {0x0000b10c, 0x07410742},
3681 -       {0x0000b110, 0x075f0740},
3682 -       {0x0000b114, 0x077f0760},
3683 -       {0x0000b118, 0x07800781},
3684 -       {0x0000b11c, 0x07a0079f},
3685 -       {0x0000b120, 0x07c107bf},
3686 -       {0x0000b124, 0x000007c0},
3687 -       {0x0000b128, 0x00000000},
3688 -       {0x0000b12c, 0x00000000},
3689 -       {0x0000b130, 0x00000000},
3690 -       {0x0000b134, 0x00000000},
3691 -       {0x0000b138, 0x00000000},
3692 -       {0x0000b13c, 0x00000000},
3693 -       {0x0000b140, 0x003f0020},
3694 -       {0x0000b144, 0x00400041},
3695 -       {0x0000b148, 0x0140005f},
3696 -       {0x0000b14c, 0x0160015f},
3697 -       {0x0000b150, 0x017e017f},
3698 -       {0x0000b154, 0x02410242},
3699 -       {0x0000b158, 0x025f0240},
3700 -       {0x0000b15c, 0x027f0260},
3701 -       {0x0000b160, 0x0341027e},
3702 -       {0x0000b164, 0x035f0340},
3703 -       {0x0000b168, 0x037f0360},
3704 -       {0x0000b16c, 0x04400441},
3705 -       {0x0000b170, 0x0460045f},
3706 -       {0x0000b174, 0x0541047f},
3707 -       {0x0000b178, 0x055f0540},
3708 -       {0x0000b17c, 0x057f0560},
3709 -       {0x0000b180, 0x06400641},
3710 -       {0x0000b184, 0x0660065f},
3711 -       {0x0000b188, 0x067e067f},
3712 -       {0x0000b18c, 0x07410742},
3713 -       {0x0000b190, 0x075f0740},
3714 -       {0x0000b194, 0x077f0760},
3715 -       {0x0000b198, 0x07800781},
3716 -       {0x0000b19c, 0x07a0079f},
3717 -       {0x0000b1a0, 0x07c107bf},
3718 -       {0x0000b1a4, 0x000007c0},
3719 -       {0x0000b1a8, 0x00000000},
3720 -       {0x0000b1ac, 0x00000000},
3721 -       {0x0000b1b0, 0x00000000},
3722 -       {0x0000b1b4, 0x00000000},
3723 -       {0x0000b1b8, 0x00000000},
3724 -       {0x0000b1bc, 0x00000000},
3725 -       {0x0000b1c0, 0x00000000},
3726 -       {0x0000b1c4, 0x00000000},
3727 -       {0x0000b1c8, 0x00000000},
3728 -       {0x0000b1cc, 0x00000000},
3729 -       {0x0000b1d0, 0x00000000},
3730 -       {0x0000b1d4, 0x00000000},
3731 -       {0x0000b1d8, 0x00000000},
3732 -       {0x0000b1dc, 0x00000000},
3733 -       {0x0000b1e0, 0x00000000},
3734 -       {0x0000b1e4, 0x00000000},
3735 -       {0x0000b1e8, 0x00000000},
3736 -       {0x0000b1ec, 0x00000000},
3737 -       {0x0000b1f0, 0x00000396},
3738 -       {0x0000b1f4, 0x00000396},
3739 -       {0x0000b1f8, 0x00000396},
3740 -       {0x0000b1fc, 0x00000196},
3741 -};
3742 +#define ar9580_1p0_rx_gain_table ar9462_common_rx_gain_table_2p0
3743
3744  static const u32 ar9580_1p0_radio_core[][2] = {
3745         /* Addr      allmodes  */