package/mac80211/patches/565-ath9k_update_ar9340_initvals.patch

   1 --- a/drivers/net/wireless/ath/ath9k/ar9340_initvals.h
   2 +++ b/drivers/net/wireless/ath/ath9k/ar9340_initvals.h
   3 @@ -1,5 +1,6 @@
   4  /*
   5 - * Copyright (c) 2011 Atheros Communications Inc.
   6 + * Copyright (c) 2010-2011 Atheros Communications Inc.
   7 + * Copyright (c) 2011-2012 Qualcomm Atheros Inc.
   8   *
   9   * Permission to use, copy, modify, and/or distribute this software for any
  10   * purpose with or without fee is hereby granted, provided that the above
  11 @@ -18,16 +19,16 @@
  12  #define INITVALS_9340_H
  13
  14  static const u32 ar9340_1p0_radio_postamble[][5] = {
  15 -       /*  Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20  */
  16 +       /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
  17         {0x000160ac, 0xa4646800, 0xa4646800, 0xa4646800, 0xa4646800},
  18 -       {0x0001610c, 0x08000000, 0x08000000, 0x00000000, 0x00000000},
  19 +       {0x0001610c, 0x08000000, 0x00000000, 0x00000000, 0x00000000},
  20         {0x00016140, 0x10804000, 0x10804000, 0x50804000, 0x50804000},
  21 -       {0x0001650c, 0x08000000, 0x08000000, 0x00000000, 0x00000000},
  22 +       {0x0001650c, 0x08000000, 0x00000000, 0x00000000, 0x00000000},
  23         {0x00016540, 0x10804000, 0x10804000, 0x50804000, 0x50804000},
  24  };
  25
  26  static const u32 ar9340Modes_lowest_ob_db_tx_gain_table_1p0[][5] = {
  27 -       /*   Addr     5G_HT20     5G_HT40     2G_HT40     2G_HT20  */
  28 +       /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
  29         {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d9, 0x000050d9},
  30         {0x0000a500, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
  31         {0x0000a504, 0x06000003, 0x06000003, 0x04000002, 0x04000002},
  32 @@ -100,20 +101,20 @@ static const u32 ar9340Modes_lowest_ob_d
  33  };
  34
  35  static const u32 ar9340Modes_fast_clock_1p0[][3] = {
  36 -       /*  Addr      5G_HT20     5G_HT40  */
  37 +       /* Addr      5G_HT20     5G_HT40   */
  38         {0x00001030, 0x00000268, 0x000004d0},
  39         {0x00001070, 0x0000018c, 0x00000318},
  40         {0x000010b0, 0x00000fd0, 0x00001fa0},
  41         {0x00008014, 0x044c044c, 0x08980898},
  42         {0x0000801c, 0x148ec02b, 0x148ec057},
  43         {0x00008318, 0x000044c0, 0x00008980},
  44 -       {0x00009e00, 0x03721821, 0x03721821},
  45 +       {0x00009e00, 0x0372131c, 0x0372131c},
  46         {0x0000a230, 0x0000000b, 0x00000016},
  47         {0x0000a254, 0x00000898, 0x00001130},
  48  };
  49
  50  static const u32 ar9340_1p0_radio_core[][2] = {
  51 -       /*  Addr     allmodes  */
  52 +       /* Addr      allmodes  */
  53         {0x00016000, 0x36db6db6},
  54         {0x00016004, 0x6db6db40},
  55         {0x00016008, 0x73f00000},
  56 @@ -146,15 +147,13 @@ static const u32 ar9340_1p0_radio_core[]
  57         {0x00016100, 0x04cb0001},
  58         {0x00016104, 0xfff80000},
  59         {0x00016108, 0x00080010},
  60 -       {0x0001610c, 0x00000000},
  61         {0x00016140, 0x50804008},
  62         {0x00016144, 0x01884080},
  63         {0x00016148, 0x000080c0},
  64         {0x00016280, 0x01000015},
  65 -       {0x00016284, 0x05530000},
  66 +       {0x00016284, 0x15530000},
  67         {0x00016288, 0x00318000},
  68         {0x0001628c, 0x50000000},
  69 -       {0x00016290, 0x4080294f},
  70         {0x00016380, 0x00000000},
  71         {0x00016384, 0x00000000},
  72         {0x00016388, 0x00800700},
  73 @@ -219,13 +218,14 @@ static const u32 ar9340_1p0_radio_core[]
  74  };
  75
  76  static const u32 ar9340_1p0_radio_core_40M[][2] = {
  77 +       /* Addr      allmodes  */
  78         {0x0001609c, 0x02566f3a},
  79         {0x000160ac, 0xa4647c00},
  80         {0x000160b0, 0x01885f5a},
  81  };
  82
  83  static const u32 ar9340_1p0_mac_postamble[][5] = {
  84 -       /* Addr       5G_HT20     5G_HT40     2G_HT40    2G_HT20  */
  85 +       /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
  86         {0x00001030, 0x00000230, 0x00000460, 0x000002c0, 0x00000160},
  87         {0x00001070, 0x00000168, 0x000002d0, 0x00000318, 0x0000018c},
  88         {0x000010b0, 0x00000e60, 0x00001cc0, 0x00007c70, 0x00003e38},
  89 @@ -237,34 +237,37 @@ static const u32 ar9340_1p0_mac_postambl
  90  };
  91
  92  static const u32 ar9340_1p0_soc_postamble[][5] = {
  93 -       /*   Addr     5G_HT20     5G_HT40     2G_HT40     2G_HT20  */
  94 +       /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
  95         {0x00007010, 0x00000023, 0x00000023, 0x00000023, 0x00000023},
  96  };
  97
  98  static const u32 ar9340_1p0_baseband_postamble[][5] = {
  99 -       /*  Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20  */
 100 +       /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
 101         {0x00009810, 0xd00a8005, 0xd00a8005, 0xd00a8011, 0xd00a8011},
 102         {0x00009820, 0x206a022e, 0x206a022e, 0x206a022e, 0x206a022e},
 103         {0x00009824, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0},
 104         {0x00009828, 0x06903081, 0x06903081, 0x06903881, 0x06903881},
 105         {0x0000982c, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4},
 106         {0x00009830, 0x0000059c, 0x0000059c, 0x0000119c, 0x0000119c},
 107 -       {0x00009c00, 0x00000044, 0x000000c4, 0x000000c4, 0x00000044},
 108 -       {0x00009e00, 0x0372161e, 0x0372161e, 0x037216a0, 0x037216a0},
 109 -       {0x00009e04, 0x00182020, 0x00182020, 0x00182020, 0x00182020},
 110 +       {0x00009c00, 0x000000c4, 0x000000c4, 0x000000c4, 0x000000c4},
 111 +       {0x00009e00, 0x0372111a, 0x0372111a, 0x037216a0, 0x037216a0},
 112 +       {0x00009e04, 0x001c2020, 0x001c2020, 0x001c2020, 0x001c2020},
 113         {0x00009e0c, 0x6c4000e2, 0x6d4000e2, 0x6d4000e2, 0x6c4000e2},
 114         {0x00009e10, 0x7ec88d2e, 0x7ec88d2e, 0x7ec88d2e, 0x7ec88d2e},
 115 -       {0x00009e14, 0x31395d5e, 0x3139605e, 0x3139605e, 0x31395d5e},
 116 +       {0x00009e14, 0x37b95d5e, 0x37b9605e, 0x3379605e, 0x33795d5e},
 117         {0x00009e18, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
 118         {0x00009e1c, 0x0001cf9c, 0x0001cf9c, 0x00021f9c, 0x00021f9c},
 119         {0x00009e20, 0x000003b5, 0x000003b5, 0x000003ce, 0x000003ce},
 120         {0x00009e2c, 0x0000001c, 0x0000001c, 0x00000021, 0x00000021},
 121 +       {0x00009e3c, 0xcf946220, 0xcf946220, 0xcf946222, 0xcf946222},
 122         {0x00009e44, 0x02321e27, 0x02321e27, 0x02291e27, 0x02291e27},
 123         {0x00009e48, 0x5030201a, 0x5030201a, 0x50302012, 0x50302012},
 124         {0x00009fc8, 0x0003f000, 0x0003f000, 0x0001a000, 0x0001a000},
 125 -       {0x0000a204, 0x00003fc0, 0x00003fc4, 0x00003fc4, 0x00003fc0},
 126 +       {0x0000a204, 0x00003ec0, 0x00003ec4, 0x00003ec4, 0x00003ec0},
 127         {0x0000a208, 0x00000104, 0x00000104, 0x00000004, 0x00000004},
 128 +       {0x0000a22c, 0x07e26a2f, 0x07e26a2f, 0x01026a2f, 0x01026a2f},
 129         {0x0000a230, 0x0000000a, 0x00000014, 0x00000016, 0x0000000b},
 130 +       {0x0000a234, 0x00000fff, 0x10000fff, 0x10000fff, 0x00000fff},
 131         {0x0000a238, 0xffb81018, 0xffb81018, 0xffb81018, 0xffb81018},
 132         {0x0000a250, 0x00000000, 0x00000000, 0x00000210, 0x00000108},
 133         {0x0000a254, 0x000007d0, 0x00000fa0, 0x00001130, 0x00000898},
 134 @@ -277,11 +280,11 @@ static const u32 ar9340_1p0_baseband_pos
 135         {0x0000a288, 0x00000220, 0x00000220, 0x00000110, 0x00000110},
 136         {0x0000a28c, 0x00011111, 0x00011111, 0x00022222, 0x00022222},
 137         {0x0000a2c4, 0x00158d18, 0x00158d18, 0x00158d18, 0x00158d18},
 138 -       {0x0000a2d0, 0x00071981, 0x00071981, 0x00071981, 0x00071982},
 139 -       {0x0000a2d8, 0xf999a83a, 0xf999a83a, 0xf999a83a, 0xf999a83a},
 140 +       {0x0000a2d0, 0x00041983, 0x00041983, 0x00041982, 0x00041982},
 141 +       {0x0000a2d8, 0x7999a83a, 0x7999a83a, 0x7999a83a, 0x7999a83a},
 142         {0x0000a358, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
 143         {0x0000a830, 0x0000019c, 0x0000019c, 0x0000019c, 0x0000019c},
 144 -       {0x0000ae04, 0x00180000, 0x00180000, 0x00180000, 0x00180000},
 145 +       {0x0000ae04, 0x001c0000, 0x001c0000, 0x001c0000, 0x001c0000},
 146         {0x0000ae18, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
 147         {0x0000ae1c, 0x0000019c, 0x0000019c, 0x0000019c, 0x0000019c},
 148         {0x0000ae20, 0x000001b5, 0x000001b5, 0x000001ce, 0x000001ce},
 149 @@ -289,21 +292,21 @@ static const u32 ar9340_1p0_baseband_pos
 150  };
 151
 152  static const u32 ar9340_1p0_baseband_core[][2] = {
 153 -       /*  Addr     allmodes  */
 154 +       /* Addr      allmodes  */
 155         {0x00009800, 0xafe68e30},
 156         {0x00009804, 0xfd14e000},
 157         {0x00009808, 0x9c0a9f6b},
 158         {0x0000980c, 0x04900000},
 159 -       {0x00009814, 0xb280c00a},
 160 +       {0x00009814, 0x3280c00a},
 161         {0x00009818, 0x00000000},
 162         {0x0000981c, 0x00020028},
 163 -       {0x00009834, 0x5f3ca3de},
 164 +       {0x00009834, 0x6400a190},
 165         {0x00009838, 0x0108ecff},
 166 -       {0x0000983c, 0x14750600},
 167 +       {0x0000983c, 0x14000600},
 168         {0x00009880, 0x201fff00},
 169         {0x00009884, 0x00001042},
 170         {0x000098a4, 0x00200400},
 171 -       {0x000098b0, 0x52440bbe},
 172 +       {0x000098b0, 0x32840bbe},
 173         {0x000098d0, 0x004b6a8e},
 174         {0x000098d4, 0x00000820},
 175         {0x000098dc, 0x00000000},
 176 @@ -329,7 +332,6 @@ static const u32 ar9340_1p0_baseband_cor
 177         {0x00009e30, 0x06336f77},
 178         {0x00009e34, 0x6af6532f},
 179         {0x00009e38, 0x0cc80c00},
 180 -       {0x00009e3c, 0xcf946222},
 181         {0x00009e40, 0x0d261820},
 182         {0x00009e4c, 0x00001004},
 183         {0x00009e50, 0x00ff03f1},
 184 @@ -342,8 +344,6 @@ static const u32 ar9340_1p0_baseband_cor
 185         {0x0000a220, 0x00000000},
 186         {0x0000a224, 0x00000000},
 187         {0x0000a228, 0x10002310},
 188 -       {0x0000a22c, 0x01036a1e},
 189 -       {0x0000a234, 0x10000fff},
 190         {0x0000a23c, 0x00000000},
 191         {0x0000a244, 0x0c000000},
 192         {0x0000a2a0, 0x00000001},
 193 @@ -351,10 +351,6 @@ static const u32 ar9340_1p0_baseband_cor
 194         {0x0000a2c8, 0x00000000},
 195         {0x0000a2cc, 0x18c43433},
 196         {0x0000a2d4, 0x00000000},
 197 -       {0x0000a2dc, 0x00000000},
 198 -       {0x0000a2e0, 0x00000000},
 199 -       {0x0000a2e4, 0x00000000},
 200 -       {0x0000a2e8, 0x00000000},
 201         {0x0000a2ec, 0x00000000},
 202         {0x0000a2f0, 0x00000000},
 203         {0x0000a2f4, 0x00000000},
 204 @@ -385,7 +381,7 @@ static const u32 ar9340_1p0_baseband_cor
 205         {0x0000a3e8, 0x20202020},
 206         {0x0000a3ec, 0x20202020},
 207         {0x0000a3f0, 0x00000000},
 208 -       {0x0000a3f4, 0x00000246},
 209 +       {0x0000a3f4, 0x00000000},
 210         {0x0000a3f8, 0x0cdbd380},
 211         {0x0000a3fc, 0x000f0f01},
 212         {0x0000a400, 0x8fa91f01},
 213 @@ -402,33 +398,17 @@ static const u32 ar9340_1p0_baseband_cor
 214         {0x0000a430, 0x1ce739ce},
 215         {0x0000a434, 0x00000000},
 216         {0x0000a438, 0x00001801},
 217 -       {0x0000a43c, 0x00000000},
 218 +       {0x0000a43c, 0x00100000},
 219         {0x0000a440, 0x00000000},
 220         {0x0000a444, 0x00000000},
 221 -       {0x0000a448, 0x04000080},
 222 +       {0x0000a448, 0x05000080},
 223         {0x0000a44c, 0x00000001},
 224         {0x0000a450, 0x00010000},
 225         {0x0000a458, 0x00000000},
 226 -       {0x0000a600, 0x00000000},
 227 -       {0x0000a604, 0x00000000},
 228 -       {0x0000a608, 0x00000000},
 229 -       {0x0000a60c, 0x00000000},
 230 -       {0x0000a610, 0x00000000},
 231 -       {0x0000a614, 0x00000000},
 232 -       {0x0000a618, 0x00000000},
 233 -       {0x0000a61c, 0x00000000},
 234 -       {0x0000a620, 0x00000000},
 235 -       {0x0000a624, 0x00000000},
 236 -       {0x0000a628, 0x00000000},
 237 -       {0x0000a62c, 0x00000000},
 238 -       {0x0000a630, 0x00000000},
 239 -       {0x0000a634, 0x00000000},
 240 -       {0x0000a638, 0x00000000},
 241 -       {0x0000a63c, 0x00000000},
 242         {0x0000a640, 0x00000000},
 243         {0x0000a644, 0x3fad9d74},
 244         {0x0000a648, 0x0048060a},
 245 -       {0x0000a64c, 0x00000637},
 246 +       {0x0000a64c, 0x00003c37},
 247         {0x0000a670, 0x03020100},
 248         {0x0000a674, 0x09080504},
 249         {0x0000a678, 0x0d0c0b0a},
 250 @@ -451,10 +431,6 @@ static const u32 ar9340_1p0_baseband_cor
 251         {0x0000a8f4, 0x00000000},
 252         {0x0000b2d0, 0x00000080},
 253         {0x0000b2d4, 0x00000000},
 254 -       {0x0000b2dc, 0x00000000},
 255 -       {0x0000b2e0, 0x00000000},
 256 -       {0x0000b2e4, 0x00000000},
 257 -       {0x0000b2e8, 0x00000000},
 258         {0x0000b2ec, 0x00000000},
 259         {0x0000b2f0, 0x00000000},
 260         {0x0000b2f4, 0x00000000},
 261 @@ -465,80 +441,108 @@ static const u32 ar9340_1p0_baseband_cor
 262  };
 263
 264  static const u32 ar9340Modes_high_power_tx_gain_table_1p0[][5] = {
 265 -       /*  Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20  */
 266 +       /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
 267 +       {0x0000a2dc, 0x0380c7fc, 0x0380c7fc, 0x03aaa352, 0x03aaa352},
 268 +       {0x0000a2e0, 0x0000f800, 0x0000f800, 0x03ccc584, 0x03ccc584},
 269 +       {0x0000a2e4, 0x03ff0000, 0x03ff0000, 0x03f0f800, 0x03f0f800},
 270 +       {0x0000a2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
 271 +       {0x0000a600, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
 272 +       {0x0000a604, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
 273 +       {0x0000a608, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
 274 +       {0x0000a60c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
 275 +       {0x0000a610, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
 276 +       {0x0000a614, 0x01404000, 0x01404000, 0x01404000, 0x01404000},
 277 +       {0x0000a618, 0x01404501, 0x01404501, 0x01404501, 0x01404501},
 278 +       {0x0000a61c, 0x02008802, 0x02008802, 0x02008501, 0x02008501},
 279 +       {0x0000a620, 0x0300cc03, 0x0300cc03, 0x0280ca03, 0x0280ca03},
 280 +       {0x0000a624, 0x0300cc03, 0x0300cc03, 0x03010c04, 0x03010c04},
 281 +       {0x0000a628, 0x0300cc03, 0x0300cc03, 0x04014c04, 0x04014c04},
 282 +       {0x0000a62c, 0x03810c03, 0x03810c03, 0x04015005, 0x04015005},
 283 +       {0x0000a630, 0x03810e04, 0x03810e04, 0x04015005, 0x04015005},
 284 +       {0x0000a634, 0x03810e04, 0x03810e04, 0x04015005, 0x04015005},
 285 +       {0x0000a638, 0x03810e04, 0x03810e04, 0x04015005, 0x04015005},
 286 +       {0x0000a63c, 0x03810e04, 0x03810e04, 0x04015005, 0x04015005},
 287 +       {0x0000b2dc, 0x0380c7fc, 0x0380c7fc, 0x03aaa352, 0x03aaa352},
 288 +       {0x0000b2e0, 0x0000f800, 0x0000f800, 0x03ccc584, 0x03ccc584},
 289 +       {0x0000b2e4, 0x03ff0000, 0x03ff0000, 0x03f0f800, 0x03f0f800},
 290 +       {0x0000b2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
 291         {0x0000a410, 0x000050d8, 0x000050d8, 0x000050d9, 0x000050d9},
 292         {0x0000a500, 0x00002220, 0x00002220, 0x00000000, 0x00000000},
 293 -       {0x0000a504, 0x04002222, 0x04002222, 0x04000002, 0x04000002},
 294 -       {0x0000a508, 0x09002421, 0x09002421, 0x08000004, 0x08000004},
 295 -       {0x0000a50c, 0x0d002621, 0x0d002621, 0x0b000200, 0x0b000200},
 296 -       {0x0000a510, 0x13004620, 0x13004620, 0x0f000202, 0x0f000202},
 297 -       {0x0000a514, 0x19004a20, 0x19004a20, 0x11000400, 0x11000400},
 298 -       {0x0000a518, 0x1d004e20, 0x1d004e20, 0x15000402, 0x15000402},
 299 -       {0x0000a51c, 0x21005420, 0x21005420, 0x19000404, 0x19000404},
 300 -       {0x0000a520, 0x26005e20, 0x26005e20, 0x1b000603, 0x1b000603},
 301 -       {0x0000a524, 0x2b005e40, 0x2b005e40, 0x1f000a02, 0x1f000a02},
 302 -       {0x0000a528, 0x2f005e42, 0x2f005e42, 0x23000a04, 0x23000a04},
 303 -       {0x0000a52c, 0x33005e44, 0x33005e44, 0x26000a20, 0x26000a20},
 304 -       {0x0000a530, 0x38005e65, 0x38005e65, 0x2a000e20, 0x2a000e20},
 305 -       {0x0000a534, 0x3c005e69, 0x3c005e69, 0x2e000e22, 0x2e000e22},
 306 -       {0x0000a538, 0x40005e6b, 0x40005e6b, 0x31000e24, 0x31000e24},
 307 -       {0x0000a53c, 0x44005e6d, 0x44005e6d, 0x34001640, 0x34001640},
 308 -       {0x0000a540, 0x49005e72, 0x49005e72, 0x38001660, 0x38001660},
 309 -       {0x0000a544, 0x4e005eb2, 0x4e005eb2, 0x3b001861, 0x3b001861},
 310 -       {0x0000a548, 0x53005f12, 0x53005f12, 0x3e001a81, 0x3e001a81},
 311 -       {0x0000a54c, 0x59025eb5, 0x59025eb5, 0x42001a83, 0x42001a83},
 312 -       {0x0000a550, 0x5e025f12, 0x5e025f12, 0x44001c84, 0x44001c84},
 313 -       {0x0000a554, 0x61027f12, 0x61027f12, 0x48001ce3, 0x48001ce3},
 314 -       {0x0000a558, 0x6702bf12, 0x6702bf12, 0x4c001ce5, 0x4c001ce5},
 315 -       {0x0000a55c, 0x6b02bf14, 0x6b02bf14, 0x50001ce9, 0x50001ce9},
 316 -       {0x0000a560, 0x6f02bf16, 0x6f02bf16, 0x54001ceb, 0x54001ceb},
 317 -       {0x0000a564, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
 318 -       {0x0000a568, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
 319 -       {0x0000a56c, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
 320 -       {0x0000a570, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
 321 -       {0x0000a574, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
 322 -       {0x0000a578, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
 323 -       {0x0000a57c, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
 324 +       {0x0000a504, 0x04002222, 0x04002222, 0x02000001, 0x02000001},
 325 +       {0x0000a508, 0x09002421, 0x09002421, 0x05000003, 0x05000003},
 326 +       {0x0000a50c, 0x0d002621, 0x0d002621, 0x0a000005, 0x0a000005},
 327 +       {0x0000a510, 0x13004620, 0x13004620, 0x0e000201, 0x0e000201},
 328 +       {0x0000a514, 0x19004a20, 0x19004a20, 0x11000203, 0x11000203},
 329 +       {0x0000a518, 0x1d004e20, 0x1d004e20, 0x14000401, 0x14000401},
 330 +       {0x0000a51c, 0x21005420, 0x21005420, 0x18000403, 0x18000403},
 331 +       {0x0000a520, 0x26005e20, 0x26005e20, 0x1b000602, 0x1b000602},
 332 +       {0x0000a524, 0x2b005e40, 0x2b005e40, 0x1f000802, 0x1f000802},
 333 +       {0x0000a528, 0x2f005e42, 0x2f005e42, 0x21000620, 0x21000620},
 334 +       {0x0000a52c, 0x33005e44, 0x33005e44, 0x25000820, 0x25000820},
 335 +       {0x0000a530, 0x38005e65, 0x38005e65, 0x29000822, 0x29000822},
 336 +       {0x0000a534, 0x3c005e69, 0x3c005e69, 0x2d000824, 0x2d000824},
 337 +       {0x0000a538, 0x40005e6b, 0x40005e6b, 0x30000828, 0x30000828},
 338 +       {0x0000a53c, 0x44005e6d, 0x44005e6d, 0x3400082a, 0x3400082a},
 339 +       {0x0000a540, 0x49005e72, 0x49005e72, 0x38000849, 0x38000849},
 340 +       {0x0000a544, 0x4e005eb2, 0x4e005eb2, 0x3b000a2c, 0x3b000a2c},
 341 +       {0x0000a548, 0x53005f12, 0x53005f12, 0x3e000e2b, 0x3e000e2b},
 342 +       {0x0000a54c, 0x59025eb5, 0x59025eb5, 0x42000e2d, 0x42000e2d},
 343 +       {0x0000a550, 0x5e025f12, 0x5e025f12, 0x4500124a, 0x4500124a},
 344 +       {0x0000a554, 0x61027f12, 0x61027f12, 0x4900124c, 0x4900124c},
 345 +       {0x0000a558, 0x6702bf12, 0x6702bf12, 0x4c00126c, 0x4c00126c},
 346 +       {0x0000a55c, 0x6b02bf14, 0x6b02bf14, 0x4f00128c, 0x4f00128c},
 347 +       {0x0000a560, 0x6f02bf16, 0x6f02bf16, 0x52001290, 0x52001290},
 348 +       {0x0000a564, 0x6f02bf16, 0x6f02bf16, 0x56001292, 0x56001292},
 349 +       {0x0000a568, 0x6f02bf16, 0x6f02bf16, 0x56001292, 0x56001292},
 350 +       {0x0000a56c, 0x6f02bf16, 0x6f02bf16, 0x56001292, 0x56001292},
 351 +       {0x0000a570, 0x6f02bf16, 0x6f02bf16, 0x56001292, 0x56001292},
 352 +       {0x0000a574, 0x6f02bf16, 0x6f02bf16, 0x56001292, 0x56001292},
 353 +       {0x0000a578, 0x6f02bf16, 0x6f02bf16, 0x56001292, 0x56001292},
 354 +       {0x0000a57c, 0x6f02bf16, 0x6f02bf16, 0x56001292, 0x56001292},
 355         {0x0000a580, 0x00802220, 0x00802220, 0x00800000, 0x00800000},
 356 -       {0x0000a584, 0x04802222, 0x04802222, 0x04800002, 0x04800002},
 357 -       {0x0000a588, 0x09802421, 0x09802421, 0x08800004, 0x08800004},
 358 -       {0x0000a58c, 0x0d802621, 0x0d802621, 0x0b800200, 0x0b800200},
 359 -       {0x0000a590, 0x13804620, 0x13804620, 0x0f800202, 0x0f800202},
 360 -       {0x0000a594, 0x19804a20, 0x19804a20, 0x11800400, 0x11800400},
 361 -       {0x0000a598, 0x1d804e20, 0x1d804e20, 0x15800402, 0x15800402},
 362 -       {0x0000a59c, 0x21805420, 0x21805420, 0x19800404, 0x19800404},
 363 -       {0x0000a5a0, 0x26805e20, 0x26805e20, 0x1b800603, 0x1b800603},
 364 -       {0x0000a5a4, 0x2b805e40, 0x2b805e40, 0x1f800a02, 0x1f800a02},
 365 -       {0x0000a5a8, 0x2f805e42, 0x2f805e42, 0x23800a04, 0x23800a04},
 366 -       {0x0000a5ac, 0x33805e44, 0x33805e44, 0x26800a20, 0x26800a20},
 367 -       {0x0000a5b0, 0x38805e65, 0x38805e65, 0x2a800e20, 0x2a800e20},
 368 -       {0x0000a5b4, 0x3c805e69, 0x3c805e69, 0x2e800e22, 0x2e800e22},
 369 -       {0x0000a5b8, 0x40805e6b, 0x40805e6b, 0x31800e24, 0x31800e24},
 370 -       {0x0000a5bc, 0x44805e6d, 0x44805e6d, 0x34801640, 0x34801640},
 371 -       {0x0000a5c0, 0x49805e72, 0x49805e72, 0x38801660, 0x38801660},
 372 -       {0x0000a5c4, 0x4e805eb2, 0x4e805eb2, 0x3b801861, 0x3b801861},
 373 -       {0x0000a5c8, 0x53805f12, 0x53805f12, 0x3e801a81, 0x3e801a81},
 374 -       {0x0000a5cc, 0x59825eb2, 0x59825eb2, 0x42801a83, 0x42801a83},
 375 -       {0x0000a5d0, 0x5e825f12, 0x5e825f12, 0x44801c84, 0x44801c84},
 376 -       {0x0000a5d4, 0x61827f12, 0x61827f12, 0x48801ce3, 0x48801ce3},
 377 -       {0x0000a5d8, 0x6782bf12, 0x6782bf12, 0x4c801ce5, 0x4c801ce5},
 378 -       {0x0000a5dc, 0x6b82bf14, 0x6b82bf14, 0x50801ce9, 0x50801ce9},
 379 -       {0x0000a5e0, 0x6f82bf16, 0x6f82bf16, 0x54801ceb, 0x54801ceb},
 380 -       {0x0000a5e4, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
 381 -       {0x0000a5e8, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
 382 -       {0x0000a5ec, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
 383 -       {0x0000a5f0, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
 384 -       {0x0000a5f4, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
 385 -       {0x0000a5f8, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
 386 -       {0x0000a5fc, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
 387 -       {0x00016044, 0x056db2db, 0x056db2db, 0x056db2db, 0x056db2db},
 388 +       {0x0000a584, 0x04802222, 0x04802222, 0x02800001, 0x02800001},
 389 +       {0x0000a588, 0x09802421, 0x09802421, 0x05800003, 0x05800003},
 390 +       {0x0000a58c, 0x0d802621, 0x0d802621, 0x0a800005, 0x0a800005},
 391 +       {0x0000a590, 0x13804620, 0x13804620, 0x0e800201, 0x0e800201},
 392 +       {0x0000a594, 0x19804a20, 0x19804a20, 0x11800203, 0x11800203},
 393 +       {0x0000a598, 0x1d804e20, 0x1d804e20, 0x14800401, 0x14800401},
 394 +       {0x0000a59c, 0x21805420, 0x21805420, 0x18800403, 0x18800403},
 395 +       {0x0000a5a0, 0x26805e20, 0x26805e20, 0x1b800602, 0x1b800602},
 396 +       {0x0000a5a4, 0x2b805e40, 0x2b805e40, 0x1f800802, 0x1f800802},
 397 +       {0x0000a5a8, 0x2f805e42, 0x2f805e42, 0x21800620, 0x21800620},
 398 +       {0x0000a5ac, 0x33805e44, 0x33805e44, 0x25800820, 0x25800820},
 399 +       {0x0000a5b0, 0x38805e65, 0x38805e65, 0x29800822, 0x29800822},
 400 +       {0x0000a5b4, 0x3c805e69, 0x3c805e69, 0x2d800824, 0x2d800824},
 401 +       {0x0000a5b8, 0x40805e6b, 0x40805e6b, 0x30800828, 0x30800828},
 402 +       {0x0000a5bc, 0x44805e6d, 0x44805e6d, 0x3480082a, 0x3480082a},
 403 +       {0x0000a5c0, 0x49805e72, 0x49805e72, 0x38800849, 0x38800849},
 404 +       {0x0000a5c4, 0x4e805eb2, 0x4e805eb2, 0x3b800a2c, 0x3b800a2c},
 405 +       {0x0000a5c8, 0x53805f12, 0x53805f12, 0x3e800e2b, 0x3e800e2b},
 406 +       {0x0000a5cc, 0x59825eb2, 0x59825eb2, 0x42800e2d, 0x42800e2d},
 407 +       {0x0000a5d0, 0x5e825f12, 0x5e825f12, 0x4580124a, 0x4580124a},
 408 +       {0x0000a5d4, 0x61827f12, 0x61827f12, 0x4980124c, 0x4980124c},
 409 +       {0x0000a5d8, 0x6782bf12, 0x6782bf12, 0x4c80126c, 0x4c80126c},
 410 +       {0x0000a5dc, 0x6b82bf14, 0x6b82bf14, 0x4f80128c, 0x4f80128c},
 411 +       {0x0000a5e0, 0x6f82bf16, 0x6f82bf16, 0x52801290, 0x52801290},
 412 +       {0x0000a5e4, 0x6f82bf16, 0x6f82bf16, 0x56801292, 0x56801292},
 413 +       {0x0000a5e8, 0x6f82bf16, 0x6f82bf16, 0x56801292, 0x56801292},
 414 +       {0x0000a5ec, 0x6f82bf16, 0x6f82bf16, 0x56801292, 0x56801292},
 415 +       {0x0000a5f0, 0x6f82bf16, 0x6f82bf16, 0x56801292, 0x56801292},
 416 +       {0x0000a5f4, 0x6f82bf16, 0x6f82bf16, 0x56801292, 0x56801292},
 417 +       {0x0000a5f8, 0x6f82bf16, 0x6f82bf16, 0x56801292, 0x56801292},
 418 +       {0x0000a5fc, 0x6f82bf16, 0x6f82bf16, 0x56801292, 0x56801292},
 419 +       {0x00016044, 0x056db2db, 0x056db2db, 0x022492db, 0x022492db},
 420         {0x00016048, 0x24925266, 0x24925266, 0x24925266, 0x24925266},
 421 -       {0x00016444, 0x056db2db, 0x056db2db, 0x056db2db, 0x056db2db},
 422 +       {0x00016444, 0x056db2db, 0x056db2db, 0x022492db, 0x022492db},
 423         {0x00016448, 0x24925266, 0x24925266, 0x24925266, 0x24925266},
 424  };
 425
 426  static const u32 ar9340Modes_high_ob_db_tx_gain_table_1p0[][5] = {
 427 -       /*  Addr       5G_HT20    5G_HT40     2G_HT40     2G_HT20  */
 428 +       /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
 429 +       {0x0000a2dc, 0x01feee00, 0x01feee00, 0x03aaa352, 0x03aaa352},
 430 +       {0x0000a2e0, 0x0000f000, 0x0000f000, 0x03ccc584, 0x03ccc584},
 431 +       {0x0000a2e4, 0x01ff0000, 0x01ff0000, 0x03f0f800, 0x03f0f800},
 432 +       {0x0000a2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
 433         {0x0000a410, 0x000050d8, 0x000050d8, 0x000050d9, 0x000050d9},
 434         {0x0000a500, 0x00002220, 0x00002220, 0x00000000, 0x00000000},
 435         {0x0000a504, 0x04002222, 0x04002222, 0x04000002, 0x04000002},
 436 @@ -559,7 +563,7 @@ static const u32 ar9340Modes_high_ob_db_
 437         {0x0000a540, 0x49005e72, 0x49005e72, 0x38001660, 0x38001660},
 438         {0x0000a544, 0x4e005eb2, 0x4e005eb2, 0x3b001861, 0x3b001861},
 439         {0x0000a548, 0x53005f12, 0x53005f12, 0x3e001a81, 0x3e001a81},
 440 -       {0x0000a54c, 0x59025eb5, 0x59025eb5, 0x42001a83, 0x42001a83},
 441 +       {0x0000a54c, 0x59025eb2, 0x59025eb2, 0x42001a83, 0x42001a83},
 442         {0x0000a550, 0x5e025f12, 0x5e025f12, 0x44001c84, 0x44001c84},
 443         {0x0000a554, 0x61027f12, 0x61027f12, 0x48001ce3, 0x48001ce3},
 444         {0x0000a558, 0x6702bf12, 0x6702bf12, 0x4c001ce5, 0x4c001ce5},
 445 @@ -604,13 +608,43 @@ static const u32 ar9340Modes_high_ob_db_
 446         {0x0000a5f4, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
 447         {0x0000a5f8, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
 448         {0x0000a5fc, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
 449 +       {0x0000a600, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
 450 +       {0x0000a604, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
 451 +       {0x0000a608, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
 452 +       {0x0000a60c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
 453 +       {0x0000a610, 0x00804000, 0x00804000, 0x00000000, 0x00000000},
 454 +       {0x0000a614, 0x00804201, 0x00804201, 0x01404000, 0x01404000},
 455 +       {0x0000a618, 0x0280c802, 0x0280c802, 0x01404501, 0x01404501},
 456 +       {0x0000a61c, 0x0280ca03, 0x0280ca03, 0x02008501, 0x02008501},
 457 +       {0x0000a620, 0x04c15104, 0x04c15104, 0x0280ca03, 0x0280ca03},
 458 +       {0x0000a624, 0x04c15305, 0x04c15305, 0x03010c04, 0x03010c04},
 459 +       {0x0000a628, 0x04c15305, 0x04c15305, 0x04014c04, 0x04014c04},
 460 +       {0x0000a62c, 0x04c15305, 0x04c15305, 0x04015005, 0x04015005},
 461 +       {0x0000a630, 0x04c15305, 0x04c15305, 0x04015005, 0x04015005},
 462 +       {0x0000a634, 0x04c15305, 0x04c15305, 0x04015005, 0x04015005},
 463 +       {0x0000a638, 0x04c15305, 0x04c15305, 0x04015005, 0x04015005},
 464 +       {0x0000a63c, 0x04c15305, 0x04c15305, 0x04015005, 0x04015005},
 465 +       {0x0000b2dc, 0x01feee00, 0x01feee00, 0x03aaa352, 0x03aaa352},
 466 +       {0x0000b2e0, 0x0000f000, 0x0000f000, 0x03ccc584, 0x03ccc584},
 467 +       {0x0000b2e4, 0x01ff0000, 0x01ff0000, 0x03f0f800, 0x03f0f800},
 468 +       {0x0000b2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
 469         {0x00016044, 0x03b6d2e4, 0x03b6d2e4, 0x03b6d2e4, 0x03b6d2e4},
 470 -       {0x00016048, 0x8e481266, 0x8e481266, 0x8e481266, 0x8e481266},
 471 +       {0x00016048, 0x8e481666, 0x8e481666, 0x8e481266, 0x8e481266},
 472 +       {0x00016280, 0x01000015, 0x01000015, 0x01001015, 0x01001015},
 473         {0x00016444, 0x03b6d2e4, 0x03b6d2e4, 0x03b6d2e4, 0x03b6d2e4},
 474 -       {0x00016448, 0x8e481266, 0x8e481266, 0x8e481266, 0x8e481266},
 475 +       {0x00016448, 0x8e481666, 0x8e481666, 0x8e481266, 0x8e481266},
 476  };
 477 +
 478  static const u32 ar9340Modes_ub124_tx_gain_table_1p0[][5] = {
 479 -       /*  Addr      5G_HT20      5G_HT40     2G_HT40    2G_HT20  */
 480 +       /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
 481 +       {0x00009810, 0xd00a8005, 0xd00a8005, 0xd00a8005, 0xd00a8005},
 482 +       {0x00009820, 0x206a022e, 0x206a022e, 0x206a00ae, 0x206a00ae},
 483 +       {0x00009830, 0x0000059c, 0x0000059c, 0x0000059c, 0x0000059c},
 484 +       {0x00009e10, 0x7ec88d2e, 0x7ec88d2e, 0x7ec82d2e, 0x7ec82d2e},
 485 +       {0x0000a2dc, 0xfef5d402, 0xfef5d402, 0xfdab5b52, 0xfdab5b52},
 486 +       {0x0000a2e0, 0xfe896600, 0xfe896600, 0xfd339c84, 0xfd339c84},
 487 +       {0x0000a2e4, 0xff01f800, 0xff01f800, 0xfec3e000, 0xfec3e000},
 488 +       {0x0000a2e8, 0xfffe0000, 0xfffe0000, 0xfffc0000, 0xfffc0000},
 489         {0x0000a410, 0x000050d8, 0x000050d8, 0x000050d9, 0x000050d9},
 490         {0x0000a500, 0x00002220, 0x00002220, 0x00000000, 0x00000000},
 491         {0x0000a504, 0x04002222, 0x04002222, 0x04000002, 0x04000002},
 492 @@ -676,15 +710,34 @@ static const u32 ar9340Modes_ub124_tx_ga
 493         {0x0000a5f4, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
 494         {0x0000a5f8, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
 495         {0x0000a5fc, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
 496 -       {0x00016044, 0x036db2db, 0x036db2db, 0x036db2db, 0x036db2db},
 497 -       {0x00016048, 0x69b65266, 0x69b65266, 0x69b65266, 0x69b65266},
 498 -       {0x00016444, 0x036db2db, 0x036db2db, 0x036db2db, 0x036db2db},
 499 -       {0x00016448, 0x69b65266, 0x69b65266, 0x69b65266, 0x69b65266},
 500 +       {0x00016044, 0x03b6d2e4, 0x03b6d2e4, 0x03b6d2e4, 0x03b6d2e4},
 501 +       {0x00016048, 0x8e480086, 0x8e480086, 0x8e480086, 0x8e480086},
 502 +       {0x00016444, 0x03b6d2e4, 0x03b6d2e4, 0x03b6d2e4, 0x03b6d2e4},
 503 +       {0x00016448, 0x8e480086, 0x8e480086, 0x8e480086, 0x8e480086},
 504 +       {0x0000a600, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
 505 +       {0x0000a604, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
 506 +       {0x0000a608, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
 507 +       {0x0000a60c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
 508 +       {0x0000a610, 0x00804000, 0x00804000, 0x00000000, 0x00000000},
 509 +       {0x0000a614, 0x00804201, 0x00804201, 0x01404000, 0x01404000},
 510 +       {0x0000a618, 0x0280c802, 0x0280c802, 0x01404501, 0x01404501},
 511 +       {0x0000a61c, 0x0280ca03, 0x0280ca03, 0x02008501, 0x02008501},
 512 +       {0x0000a620, 0x04c15104, 0x04c15104, 0x0280ca03, 0x0280ca03},
 513 +       {0x0000a624, 0x04c15305, 0x04c15305, 0x03010c04, 0x03010c04},
 514 +       {0x0000a628, 0x04c15305, 0x04c15305, 0x04014c04, 0x04014c04},
 515 +       {0x0000a62c, 0x04c15305, 0x04c15305, 0x04015005, 0x04015005},
 516 +       {0x0000a630, 0x04c15305, 0x04c15305, 0x04015005, 0x04015005},
 517 +       {0x0000a634, 0x04c15305, 0x04c15305, 0x04015005, 0x04015005},
 518 +       {0x0000a638, 0x04c15305, 0x04c15305, 0x04015005, 0x04015005},
 519 +       {0x0000a63c, 0x04c15305, 0x04c15305, 0x04015005, 0x04015005},
 520 +       {0x0000b2dc, 0xfef5d402, 0xfef5d402, 0xfdab5b52, 0xfdab5b52},
 521 +       {0x0000b2e0, 0xfe896600, 0xfe896600, 0xfd339c84, 0xfd339c84},
 522 +       {0x0000b2e4, 0xff01f800, 0xff01f800, 0xfec3e000, 0xfec3e000},
 523 +       {0x0000b2e8, 0xfffe0000, 0xfffe0000, 0xfffc0000, 0xfffc0000},
 524  };
 525
 526 -
 527  static const u32 ar9340Common_rx_gain_table_1p0[][2] = {
 528 -       /*   Addr     allmodes */
 529 +       /* Addr      allmodes  */
 530         {0x0000a000, 0x00010000},
 531         {0x0000a004, 0x00030002},
 532         {0x0000a008, 0x00050004},
 533 @@ -845,14 +898,14 @@ static const u32 ar9340Common_rx_gain_ta
 534         {0x0000b074, 0x00000000},
 535         {0x0000b078, 0x00000000},
 536         {0x0000b07c, 0x00000000},
 537 -       {0x0000b080, 0x32323232},
 538 -       {0x0000b084, 0x2f2f3232},
 539 -       {0x0000b088, 0x23282a2d},
 540 -       {0x0000b08c, 0x1c1e2123},
 541 -       {0x0000b090, 0x14171919},
 542 -       {0x0000b094, 0x0e0e1214},
 543 -       {0x0000b098, 0x03050707},
 544 -       {0x0000b09c, 0x00030303},
 545 +       {0x0000b080, 0x23232323},
 546 +       {0x0000b084, 0x21232323},
 547 +       {0x0000b088, 0x19191c1e},
 548 +       {0x0000b08c, 0x12141417},
 549 +       {0x0000b090, 0x07070e0e},
 550 +       {0x0000b094, 0x03030305},
 551 +       {0x0000b098, 0x00000003},
 552 +       {0x0000b09c, 0x00000000},
 553         {0x0000b0a0, 0x00000000},
 554         {0x0000b0a4, 0x00000000},
 555         {0x0000b0a8, 0x00000000},
 556 @@ -944,7 +997,11 @@ static const u32 ar9340Common_rx_gain_ta
 557  };
 558
 559  static const u32 ar9340Modes_low_ob_db_tx_gain_table_1p0[][5] = {
 560 -       /*  Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20  */
 561 +       /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
 562 +       {0x0000a2dc, 0x0380c7fc, 0x0380c7fc, 0x03aaa352, 0x03aaa352},
 563 +       {0x0000a2e0, 0x0000f800, 0x0000f800, 0x03ccc584, 0x03ccc584},
 564 +       {0x0000a2e4, 0x03ff0000, 0x03ff0000, 0x03f0f800, 0x03f0f800},
 565 +       {0x0000a2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
 566         {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d9, 0x000050d9},
 567         {0x0000a500, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
 568         {0x0000a504, 0x06000003, 0x06000003, 0x04000002, 0x04000002},
 569 @@ -952,8 +1009,8 @@ static const u32 ar9340Modes_low_ob_db_t
 570         {0x0000a50c, 0x10000023, 0x10000023, 0x0b000200, 0x0b000200},
 571         {0x0000a510, 0x16000220, 0x16000220, 0x0f000202, 0x0f000202},
 572         {0x0000a514, 0x1c000223, 0x1c000223, 0x12000400, 0x12000400},
 573 -       {0x0000a518, 0x21020220, 0x21020220, 0x16000402, 0x16000402},
 574 -       {0x0000a51c, 0x27020223, 0x27020223, 0x19000404, 0x19000404},
 575 +       {0x0000a518, 0x21002220, 0x21002220, 0x16000402, 0x16000402},
 576 +       {0x0000a51c, 0x27002223, 0x27002223, 0x19000404, 0x19000404},
 577         {0x0000a520, 0x2b022220, 0x2b022220, 0x1c000603, 0x1c000603},
 578         {0x0000a524, 0x2f022222, 0x2f022222, 0x21000a02, 0x21000a02},
 579         {0x0000a528, 0x34022225, 0x34022225, 0x25000a04, 0x25000a04},
 580 @@ -965,19 +1022,19 @@ static const u32 ar9340Modes_low_ob_db_t
 581         {0x0000a540, 0x4e02246c, 0x4e02246c, 0x3c001660, 0x3c001660},
 582         {0x0000a544, 0x5302266c, 0x5302266c, 0x3f001861, 0x3f001861},
 583         {0x0000a548, 0x5702286c, 0x5702286c, 0x43001a81, 0x43001a81},
 584 -       {0x0000a54c, 0x5c04286b, 0x5c04286b, 0x47001a83, 0x47001a83},
 585 -       {0x0000a550, 0x61042a6c, 0x61042a6c, 0x4a001c84, 0x4a001c84},
 586 -       {0x0000a554, 0x66062a6c, 0x66062a6c, 0x4e001ce3, 0x4e001ce3},
 587 -       {0x0000a558, 0x6b062e6c, 0x6b062e6c, 0x52001ce5, 0x52001ce5},
 588 -       {0x0000a55c, 0x7006308c, 0x7006308c, 0x56001ce9, 0x56001ce9},
 589 -       {0x0000a560, 0x730a308a, 0x730a308a, 0x5a001ceb, 0x5a001ceb},
 590 -       {0x0000a564, 0x770a308c, 0x770a308c, 0x5d001eec, 0x5d001eec},
 591 -       {0x0000a568, 0x770a308c, 0x770a308c, 0x5d001eec, 0x5d001eec},
 592 -       {0x0000a56c, 0x770a308c, 0x770a308c, 0x5d001eec, 0x5d001eec},
 593 -       {0x0000a570, 0x770a308c, 0x770a308c, 0x5d001eec, 0x5d001eec},
 594 -       {0x0000a574, 0x770a308c, 0x770a308c, 0x5d001eec, 0x5d001eec},
 595 -       {0x0000a578, 0x770a308c, 0x770a308c, 0x5d001eec, 0x5d001eec},
 596 -       {0x0000a57c, 0x770a308c, 0x770a308c, 0x5d001eec, 0x5d001eec},
 597 +       {0x0000a54c, 0x5c02486b, 0x5c02486b, 0x47001a83, 0x47001a83},
 598 +       {0x0000a550, 0x61024a6c, 0x61024a6c, 0x4a001c84, 0x4a001c84},
 599 +       {0x0000a554, 0x66026a6c, 0x66026a6c, 0x4e001ce3, 0x4e001ce3},
 600 +       {0x0000a558, 0x6b026e6c, 0x6b026e6c, 0x52001ce5, 0x52001ce5},
 601 +       {0x0000a55c, 0x7002708c, 0x7002708c, 0x56001ce9, 0x56001ce9},
 602 +       {0x0000a560, 0x7302b08a, 0x7302b08a, 0x5a001ceb, 0x5a001ceb},
 603 +       {0x0000a564, 0x7702b08c, 0x7702b08c, 0x5d001eec, 0x5d001eec},
 604 +       {0x0000a568, 0x7702b08c, 0x7702b08c, 0x5d001eec, 0x5d001eec},
 605 +       {0x0000a56c, 0x7702b08c, 0x7702b08c, 0x5d001eec, 0x5d001eec},
 606 +       {0x0000a570, 0x7702b08c, 0x7702b08c, 0x5d001eec, 0x5d001eec},
 607 +       {0x0000a574, 0x7702b08c, 0x7702b08c, 0x5d001eec, 0x5d001eec},
 608 +       {0x0000a578, 0x7702b08c, 0x7702b08c, 0x5d001eec, 0x5d001eec},
 609 +       {0x0000a57c, 0x7702b08c, 0x7702b08c, 0x5d001eec, 0x5d001eec},
 610         {0x0000a580, 0x00800000, 0x00800000, 0x00800000, 0x00800000},
 611         {0x0000a584, 0x06800003, 0x06800003, 0x04800002, 0x04800002},
 612         {0x0000a588, 0x0a800020, 0x0a800020, 0x08800004, 0x08800004},
 613 @@ -1010,14 +1067,40 @@ static const u32 ar9340Modes_low_ob_db_t
 614         {0x0000a5f4, 0x778a308c, 0x778a308c, 0x5d801eec, 0x5d801eec},
 615         {0x0000a5f8, 0x778a308c, 0x778a308c, 0x5d801eec, 0x5d801eec},
 616         {0x0000a5fc, 0x778a308c, 0x778a308c, 0x5d801eec, 0x5d801eec},
 617 +       {0x0000a600, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
 618 +       {0x0000a604, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
 619 +       {0x0000a608, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
 620 +       {0x0000a60c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
 621 +       {0x0000a610, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
 622 +       {0x0000a614, 0x01404000, 0x01404000, 0x01404000, 0x01404000},
 623 +       {0x0000a618, 0x01404501, 0x01404501, 0x01404501, 0x01404501},
 624 +       {0x0000a61c, 0x02008802, 0x02008802, 0x02008501, 0x02008501},
 625 +       {0x0000a620, 0x0300cc03, 0x0300cc03, 0x0280ca03, 0x0280ca03},
 626 +       {0x0000a624, 0x0300cc03, 0x0300cc03, 0x03010c04, 0x03010c04},
 627 +       {0x0000a628, 0x0300cc03, 0x0300cc03, 0x04014c04, 0x04014c04},
 628 +       {0x0000a62c, 0x03810c03, 0x03810c03, 0x04015005, 0x04015005},
 629 +       {0x0000a630, 0x03810e04, 0x03810e04, 0x04015005, 0x04015005},
 630 +       {0x0000a634, 0x03810e04, 0x03810e04, 0x04015005, 0x04015005},
 631 +       {0x0000a638, 0x03810e04, 0x03810e04, 0x04015005, 0x04015005},
 632 +       {0x0000a63c, 0x03810e04, 0x03810e04, 0x04015005, 0x04015005},
 633 +       {0x0000b2dc, 0x0380c7fc, 0x0380c7fc, 0x03aaa352, 0x03aaa352},
 634 +       {0x0000b2e0, 0x0000f800, 0x0000f800, 0x03ccc584, 0x03ccc584},
 635 +       {0x0000b2e4, 0x03ff0000, 0x03ff0000, 0x03f0f800, 0x03f0f800},
 636 +       {0x0000b2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
 637         {0x00016044, 0x056db2db, 0x056db2db, 0x056db2db, 0x056db2db},
 638 -       {0x00016048, 0x24925266, 0x24925266, 0x24925266, 0x24925266},
 639 +       {0x00016048, 0x24925666, 0x24925666, 0x24925266, 0x24925266},
 640 +       {0x00016280, 0x01000015, 0x01000015, 0x01001015, 0x01001015},
 641 +       {0x00016288, 0xf0318000, 0xf0318000, 0xf0318000, 0xf0318000},
 642         {0x00016444, 0x056db2db, 0x056db2db, 0x056db2db, 0x056db2db},
 643 -       {0x00016448, 0x24925266, 0x24925266, 0x24925266, 0x24925266},
 644 +       {0x00016448, 0x24925666, 0x24925666, 0x24925266, 0x24925266},
 645  };
 646
 647  static const u32 ar9340Modes_mixed_ob_db_tx_gain_table_1p0[][5] = {
 648 -       /*  Addr       5G_HT20     5G_HT40     2G_HT40    2G_HT20  */
 649 +       /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
 650 +       {0x0000a2dc, 0x0380c7fc, 0x0380c7fc, 0x03aaa352, 0x03aaa352},
 651 +       {0x0000a2e0, 0x0000f800, 0x0000f800, 0x03ccc584, 0x03ccc584},
 652 +       {0x0000a2e4, 0x03ff0000, 0x03ff0000, 0x03f0f800, 0x03f0f800},
 653 +       {0x0000a2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
 654         {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d9, 0x000050d9},
 655         {0x0000a500, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
 656         {0x0000a504, 0x06000003, 0x06000003, 0x04000002, 0x04000002},
 657 @@ -1025,8 +1108,8 @@ static const u32 ar9340Modes_mixed_ob_db
 658         {0x0000a50c, 0x10000023, 0x10000023, 0x0b000200, 0x0b000200},
 659         {0x0000a510, 0x16000220, 0x16000220, 0x0f000202, 0x0f000202},
 660         {0x0000a514, 0x1c000223, 0x1c000223, 0x11000400, 0x11000400},
 661 -       {0x0000a518, 0x21020220, 0x21020220, 0x15000402, 0x15000402},
 662 -       {0x0000a51c, 0x27020223, 0x27020223, 0x19000404, 0x19000404},
 663 +       {0x0000a518, 0x21002220, 0x21002220, 0x15000402, 0x15000402},
 664 +       {0x0000a51c, 0x27002223, 0x27002223, 0x19000404, 0x19000404},
 665         {0x0000a520, 0x2b022220, 0x2b022220, 0x1b000603, 0x1b000603},
 666         {0x0000a524, 0x2f022222, 0x2f022222, 0x1f000a02, 0x1f000a02},
 667         {0x0000a528, 0x34022225, 0x34022225, 0x23000a04, 0x23000a04},
 668 @@ -1038,19 +1121,19 @@ static const u32 ar9340Modes_mixed_ob_db
 669         {0x0000a540, 0x4e02246c, 0x4e02246c, 0x38001660, 0x38001660},
 670         {0x0000a544, 0x5302266c, 0x5302266c, 0x3b001861, 0x3b001861},
 671         {0x0000a548, 0x5702286c, 0x5702286c, 0x3e001a81, 0x3e001a81},
 672 -       {0x0000a54c, 0x5c04286b, 0x5c04286b, 0x42001a83, 0x42001a83},
 673 -       {0x0000a550, 0x61042a6c, 0x61042a6c, 0x44001c84, 0x44001c84},
 674 -       {0x0000a554, 0x66062a6c, 0x66062a6c, 0x48001ce3, 0x48001ce3},
 675 -       {0x0000a558, 0x6b062e6c, 0x6b062e6c, 0x4c001ce5, 0x4c001ce5},
 676 -       {0x0000a55c, 0x7006308c, 0x7006308c, 0x50001ce9, 0x50001ce9},
 677 -       {0x0000a560, 0x730a308a, 0x730a308a, 0x54001ceb, 0x54001ceb},
 678 -       {0x0000a564, 0x770a308c, 0x770a308c, 0x56001eec, 0x56001eec},
 679 -       {0x0000a568, 0x770a308c, 0x770a308c, 0x56001eec, 0x56001eec},
 680 -       {0x0000a56c, 0x770a308c, 0x770a308c, 0x56001eec, 0x56001eec},
 681 -       {0x0000a570, 0x770a308c, 0x770a308c, 0x56001eec, 0x56001eec},
 682 -       {0x0000a574, 0x770a308c, 0x770a308c, 0x56001eec, 0x56001eec},
 683 -       {0x0000a578, 0x770a308c, 0x770a308c, 0x56001eec, 0x56001eec},
 684 -       {0x0000a57c, 0x770a308c, 0x770a308c, 0x56001eec, 0x56001eec},
 685 +       {0x0000a54c, 0x5c02486b, 0x5c02486b, 0x42001a83, 0x42001a83},
 686 +       {0x0000a550, 0x61024a6c, 0x61024a6c, 0x44001c84, 0x44001c84},
 687 +       {0x0000a554, 0x66026a6c, 0x66026a6c, 0x48001ce3, 0x48001ce3},
 688 +       {0x0000a558, 0x6b026e6c, 0x6b026e6c, 0x4c001ce5, 0x4c001ce5},
 689 +       {0x0000a55c, 0x7002708c, 0x7002708c, 0x50001ce9, 0x50001ce9},
 690 +       {0x0000a560, 0x7302b08a, 0x7302b08a, 0x54001ceb, 0x54001ceb},
 691 +       {0x0000a564, 0x7702b08c, 0x7702b08c, 0x56001eec, 0x56001eec},
 692 +       {0x0000a568, 0x7702b08c, 0x7702b08c, 0x56001eec, 0x56001eec},
 693 +       {0x0000a56c, 0x7702b08c, 0x7702b08c, 0x56001eec, 0x56001eec},
 694 +       {0x0000a570, 0x7702b08c, 0x7702b08c, 0x56001eec, 0x56001eec},
 695 +       {0x0000a574, 0x7702b08c, 0x7702b08c, 0x56001eec, 0x56001eec},
 696 +       {0x0000a578, 0x7702b08c, 0x7702b08c, 0x56001eec, 0x56001eec},
 697 +       {0x0000a57c, 0x7702b08c, 0x7702b08c, 0x56001eec, 0x56001eec},
 698         {0x0000a580, 0x00800000, 0x00800000, 0x00800000, 0x00800000},
 699         {0x0000a584, 0x06800003, 0x06800003, 0x04800002, 0x04800002},
 700         {0x0000a588, 0x0a800020, 0x0a800020, 0x08800004, 0x08800004},
 701 @@ -1083,14 +1166,36 @@ static const u32 ar9340Modes_mixed_ob_db
 702         {0x0000a5f4, 0x778a308c, 0x778a308c, 0x56801eec, 0x56801eec},
 703         {0x0000a5f8, 0x778a308c, 0x778a308c, 0x56801eec, 0x56801eec},
 704         {0x0000a5fc, 0x778a308c, 0x778a308c, 0x56801eec, 0x56801eec},
 705 +       {0x0000a600, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
 706 +       {0x0000a604, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
 707 +       {0x0000a608, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
 708 +       {0x0000a60c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
 709 +       {0x0000a610, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
 710 +       {0x0000a614, 0x01404000, 0x01404000, 0x01404000, 0x01404000},
 711 +       {0x0000a618, 0x01404501, 0x01404501, 0x01404501, 0x01404501},
 712 +       {0x0000a61c, 0x02008802, 0x02008802, 0x02008501, 0x02008501},
 713 +       {0x0000a620, 0x0300cc03, 0x0300cc03, 0x0280ca03, 0x0280ca03},
 714 +       {0x0000a624, 0x0300cc03, 0x0300cc03, 0x03010c04, 0x03010c04},
 715 +       {0x0000a628, 0x0300cc03, 0x0300cc03, 0x04014c04, 0x04014c04},
 716 +       {0x0000a62c, 0x03810c03, 0x03810c03, 0x04015005, 0x04015005},
 717 +       {0x0000a630, 0x03810e04, 0x03810e04, 0x04015005, 0x04015005},
 718 +       {0x0000a634, 0x03810e04, 0x03810e04, 0x04015005, 0x04015005},
 719 +       {0x0000a638, 0x03810e04, 0x03810e04, 0x04015005, 0x04015005},
 720 +       {0x0000a63c, 0x03810e04, 0x03810e04, 0x04015005, 0x04015005},
 721 +       {0x0000b2dc, 0x0380c7fc, 0x0380c7fc, 0x03aaa352, 0x03aaa352},
 722 +       {0x0000b2e0, 0x0000f800, 0x0000f800, 0x03ccc584, 0x03ccc584},
 723 +       {0x0000b2e4, 0x03ff0000, 0x03ff0000, 0x03f0f800, 0x03f0f800},
 724 +       {0x0000b2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
 725         {0x00016044, 0x056db2db, 0x056db2db, 0x03b6d2e4, 0x03b6d2e4},
 726 -       {0x00016048, 0x24927266, 0x24927266, 0x8e483266, 0x8e483266},
 727 +       {0x00016048, 0x24925666, 0x24925666, 0x8e481266, 0x8e481266},
 728 +       {0x00016280, 0x01000015, 0x01000015, 0x01001015, 0x01001015},
 729 +       {0x00016288, 0x30318000, 0x30318000, 0x00318000, 0x00318000},
 730         {0x00016444, 0x056db2db, 0x056db2db, 0x03b6d2e4, 0x03b6d2e4},
 731 -       {0x00016448, 0x24927266, 0x24927266, 0x8e482266, 0x8e482266},
 732 +       {0x00016448, 0x24925666, 0x24925666, 0x8e481266, 0x8e481266},
 733  };
 734
 735  static const u32 ar9340_1p0_mac_core[][2] = {
 736 -       /*    Addr        allmodes        */
 737 +       /* Addr      allmodes  */
 738         {0x00000008, 0x00000000},
 739         {0x00000030, 0x00020085},
 740         {0x00000034, 0x00000005},
 741 @@ -1119,6 +1224,7 @@ static const u32 ar9340_1p0_mac_core[][2
 742         {0x00008004, 0x00000000},
 743         {0x00008008, 0x00000000},
 744         {0x0000800c, 0x00000000},
 745 +       {0x00008010, 0x00080800},
 746         {0x00008018, 0x00000000},
 747         {0x00008020, 0x00000000},
 748         {0x00008038, 0x00000000},
 749 @@ -1146,7 +1252,7 @@ static const u32 ar9340_1p0_mac_core[][2
 750         {0x000080bc, 0x00000000},
 751         {0x000080c0, 0x2a800000},
 752         {0x000080c4, 0x06900168},
 753 -       {0x000080c8, 0x13881c20},
 754 +       {0x000080c8, 0x13881c22},
 755         {0x000080cc, 0x01f40000},
 756         {0x000080d0, 0x00252500},
 757         {0x000080d4, 0x00a00000},
 758 @@ -1250,11 +1356,11 @@ static const u32 ar9340_1p0_mac_core[][2
 759         {0x000083c4, 0x00000000},
 760         {0x000083c8, 0x00000000},
 761         {0x000083cc, 0x00000200},
 762 -       {0x000083d0, 0x000301ff},
 763 +       {0x000083d0, 0x000101ff},
 764  };
 765
 766  static const u32 ar9340Common_wo_xlna_rx_gain_table_1p0[][2] = {
 767 -       /*    Addr        allmodes        */
 768 +       /* Addr      allmodes  */
 769         {0x0000a000, 0x00010000},
 770         {0x0000a004, 0x00030002},
 771         {0x0000a008, 0x00050004},
 772 @@ -1514,12 +1620,11 @@ static const u32 ar9340Common_wo_xlna_rx
 773  };
 774
 775  static const u32 ar9340_1p0_soc_preamble[][2] = {
 776 -       /*    Addr        allmodes        */
 777 -       {0x000040a4, 0x00a0c1c9},
 778 +       /* Addr      allmodes  */
 779         {0x00007008, 0x00000000},
 780         {0x00007020, 0x00000000},
 781         {0x00007034, 0x00000002},
 782         {0x00007038, 0x000004c2},
 783  };
 784
 785 -#endif
 786 +#endif /* INITVALS_9340_1P0_H */