package/mac80211/patches/562-ath9k_update_ar9330_initvals.patch

   1 --- a/drivers/net/wireless/ath/ath9k/ar9330_1p1_initvals.h
   2 +++ b/drivers/net/wireless/ath/ath9k/ar9330_1p1_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,7 +19,7 @@
  12  #define INITVALS_9330_1P1_H
  13
  14  static const u32 ar9331_1p1_baseband_postamble[][5] = {
  15 -       /*  Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20  */
  16 +       /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
  17         {0x00009810, 0xd00a8005, 0xd00a8005, 0xd00a8005, 0xd00a8005},
  18         {0x00009820, 0x206a002e, 0x206a002e, 0x206a002e, 0x206a002e},
  19         {0x00009824, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0},
  20 @@ -27,10 +28,10 @@ static const u32 ar9331_1p1_baseband_pos
  21         {0x00009830, 0x0000059c, 0x0000059c, 0x0000059c, 0x0000059c},
  22         {0x00009c00, 0x00000044, 0x00000044, 0x00000044, 0x00000044},
  23         {0x00009e00, 0x0372161e, 0x0372161e, 0x037216a4, 0x037216a4},
  24 -       {0x00009e04, 0x00182020, 0x00182020, 0x00182020, 0x00182020},
  25 +       {0x00009e04, 0x00202020, 0x00202020, 0x00202020, 0x00202020},
  26         {0x00009e0c, 0x6c4000e2, 0x6d4000e2, 0x6d4000e2, 0x6c4000e2},
  27         {0x00009e10, 0x7ec80d2e, 0x7ec80d2e, 0x7ec80d2e, 0x7ec80d2e},
  28 -       {0x00009e14, 0x31395d5e, 0x3139605e, 0x3139605e, 0x31395d5e},
  29 +       {0x00009e14, 0x31365d5e, 0x3136605e, 0x3136605e, 0x31365d5e},
  30         {0x00009e18, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
  31         {0x00009e1c, 0x0001cf9c, 0x0001cf9c, 0x00021f9c, 0x00021f9c},
  32         {0x00009e20, 0x000003b5, 0x000003b5, 0x000003ce, 0x000003ce},
  33 @@ -55,7 +56,7 @@ static const u32 ar9331_1p1_baseband_pos
  34         {0x0000a288, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
  35         {0x0000a28c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
  36         {0x0000a2c4, 0x00158d18, 0x00158d18, 0x00158d18, 0x00158d18},
  37 -       {0x0000a2d0, 0x00071981, 0x00071981, 0x00071981, 0x00071981},
  38 +       {0x0000a2d0, 0x00071982, 0x00071982, 0x00071982, 0x00071982},
  39         {0x0000a2d8, 0xf999a83a, 0xf999a83a, 0xf999a83a, 0xf999a83a},
  40         {0x0000a358, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
  41         {0x0000ae04, 0x00802020, 0x00802020, 0x00802020, 0x00802020},
  42 @@ -63,7 +64,7 @@ static const u32 ar9331_1p1_baseband_pos
  43  };
  44
  45  static const u32 ar9331_modes_lowest_ob_db_tx_gain_1p1[][5] = {
  46 -       /*   Addr     5G_HT20     5G_HT40     2G_HT40     2G_HT20  */
  47 +       /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
  48         {0x0000a2d8, 0x7999a83a, 0x7999a83a, 0x7999a83a, 0x7999a83a},
  49         {0x0000a2dc, 0xffff2a52, 0xffff2a52, 0xffff2a52, 0xffff2a52},
  50         {0x0000a2e0, 0xffffcc84, 0xffffcc84, 0xffffcc84, 0xffffcc84},
  51 @@ -155,7 +156,7 @@ static const u32 ar9331_modes_lowest_ob_
  52  };
  53
  54  static const u32 ar9331_modes_high_ob_db_tx_gain_1p1[][5] = {
  55 -       /*   Addr     5G_HT20     5G_HT40     2G_HT40     2G_HT20  */
  56 +       /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
  57         {0x0000a2d8, 0x7999a83a, 0x7999a83a, 0x7999a83a, 0x7999a83a},
  58         {0x0000a2dc, 0xffaa9a52, 0xffaa9a52, 0xffaa9a52, 0xffaa9a52},
  59         {0x0000a2e0, 0xffb31c84, 0xffb31c84, 0xffb31c84, 0xffb31c84},
  60 @@ -245,7 +246,7 @@ static const u32 ar9331_modes_high_ob_db
  61  };
  62
  63  static const u32 ar9331_modes_low_ob_db_tx_gain_1p1[][5] = {
  64 -       /*   Addr     5G_HT20     5G_HT40     2G_HT40     2G_HT20  */
  65 +       /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
  66         {0x0000a2d8, 0x7999a83a, 0x7999a83a, 0x7999a83a, 0x7999a83a},
  67         {0x0000a2dc, 0xffff2a52, 0xffff2a52, 0xffff2a52, 0xffff2a52},
  68         {0x0000a2e0, 0xffffcc84, 0xffffcc84, 0xffffcc84, 0xffffcc84},
  69 @@ -377,14 +378,14 @@ static const u32 ar9331_1p1_radio_core[]
  70         {0x000160b4, 0x92480040},
  71         {0x000160c0, 0x006db6db},
  72         {0x000160c4, 0x0186db60},
  73 -       {0x000160c8, 0x6db6db6c},
  74 +       {0x000160c8, 0x6db4db6c},
  75         {0x000160cc, 0x6de6c300},
  76         {0x000160d0, 0x14500820},
  77         {0x00016100, 0x04cb0001},
  78         {0x00016104, 0xfff80015},
  79         {0x00016108, 0x00080010},
  80         {0x0001610c, 0x00170000},
  81 -       {0x00016140, 0x10804000},
  82 +       {0x00016140, 0x10800000},
  83         {0x00016144, 0x01884080},
  84         {0x00016148, 0x000080c0},
  85         {0x00016280, 0x01000015},
  86 @@ -417,7 +418,7 @@ static const u32 ar9331_1p1_radio_core[]
  87  };
  88
  89  static const u32 ar9331_1p1_soc_postamble[][5] = {
  90 -       /*  Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20  */
  91 +       /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
  92         {0x00007010, 0x00000022, 0x00000022, 0x00000022, 0x00000022},
  93  };
  94
  95 @@ -691,7 +692,7 @@ static const u32 ar9331_1p1_baseband_cor
  96  };
  97
  98  static const u32 ar9331_modes_high_power_tx_gain_1p1[][5] = {
  99 -       /*  Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20  */
 100 +       /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
 101         {0x0000a2d8, 0x7999a83a, 0x7999a83a, 0x7999a83a, 0x7999a83a},
 102         {0x0000a2dc, 0xffff2a52, 0xffff2a52, 0xffff2a52, 0xffff2a52},
 103         {0x0000a2e0, 0xffffcc84, 0xffffcc84, 0xffffcc84, 0xffffcc84},
 104 @@ -783,7 +784,7 @@ static const u32 ar9331_modes_high_power
 105  };
 106
 107  static const u32 ar9331_1p1_mac_postamble[][5] = {
 108 -       /*  Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20  */
 109 +       /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
 110         {0x00001030, 0x00000230, 0x00000460, 0x000002c0, 0x00000160},
 111         {0x00001070, 0x00000168, 0x000002d0, 0x00000318, 0x0000018c},
 112         {0x000010b0, 0x00000e60, 0x00001cc0, 0x00007c70, 0x00003e38},
 113 @@ -973,26 +974,27 @@ static const u32 ar9331_1p1_mac_core[][2
 114
 115  static const u32 ar9331_common_rx_gain_1p1[][2] = {
 116         /* Addr      allmodes  */
 117 -       {0x0000a000, 0x00010000},
 118 -       {0x0000a004, 0x00030002},
 119 -       {0x0000a008, 0x00050004},
 120 -       {0x0000a00c, 0x00810080},
 121 -       {0x0000a010, 0x00830082},
 122 -       {0x0000a014, 0x01810180},
 123 -       {0x0000a018, 0x01830182},
 124 -       {0x0000a01c, 0x01850184},
 125 -       {0x0000a020, 0x01890188},
 126 -       {0x0000a024, 0x018b018a},
 127 -       {0x0000a028, 0x018d018c},
 128 -       {0x0000a02c, 0x01910190},
 129 -       {0x0000a030, 0x01930192},
 130 -       {0x0000a034, 0x01950194},
 131 -       {0x0000a038, 0x038a0196},
 132 -       {0x0000a03c, 0x038c038b},
 133 -       {0x0000a040, 0x0390038d},
 134 -       {0x0000a044, 0x03920391},
 135 -       {0x0000a048, 0x03940393},
 136 -       {0x0000a04c, 0x03960395},
 137 +       {0x00009e18, 0x05000000},
 138 +       {0x0000a000, 0x00060005},
 139 +       {0x0000a004, 0x00810080},
 140 +       {0x0000a008, 0x00830082},
 141 +       {0x0000a00c, 0x00850084},
 142 +       {0x0000a010, 0x01820181},
 143 +       {0x0000a014, 0x01840183},
 144 +       {0x0000a018, 0x01880185},
 145 +       {0x0000a01c, 0x018a0189},
 146 +       {0x0000a020, 0x02850284},
 147 +       {0x0000a024, 0x02890288},
 148 +       {0x0000a028, 0x028b028a},
 149 +       {0x0000a02c, 0x03850384},
 150 +       {0x0000a030, 0x03890388},
 151 +       {0x0000a034, 0x038b038a},
 152 +       {0x0000a038, 0x038d038c},
 153 +       {0x0000a03c, 0x03910390},
 154 +       {0x0000a040, 0x03930392},
 155 +       {0x0000a044, 0x03950394},
 156 +       {0x0000a048, 0x00000396},
 157 +       {0x0000a04c, 0x00000000},
 158         {0x0000a050, 0x00000000},
 159         {0x0000a054, 0x00000000},
 160         {0x0000a058, 0x00000000},
 161 @@ -1005,15 +1007,15 @@ static const u32 ar9331_common_rx_gain_1
 162         {0x0000a074, 0x00000000},
 163         {0x0000a078, 0x00000000},
 164         {0x0000a07c, 0x00000000},
 165 -       {0x0000a080, 0x22222229},
 166 -       {0x0000a084, 0x1d1d1d1d},
 167 -       {0x0000a088, 0x1d1d1d1d},
 168 -       {0x0000a08c, 0x1d1d1d1d},
 169 -       {0x0000a090, 0x171d1d1d},
 170 -       {0x0000a094, 0x11111717},
 171 -       {0x0000a098, 0x00030311},
 172 -       {0x0000a09c, 0x00000000},
 173 -       {0x0000a0a0, 0x00000000},
 174 +       {0x0000a080, 0x28282828},
 175 +       {0x0000a084, 0x28282828},
 176 +       {0x0000a088, 0x28282828},
 177 +       {0x0000a08c, 0x28282828},
 178 +       {0x0000a090, 0x28282828},
 179 +       {0x0000a094, 0x24242428},
 180 +       {0x0000a098, 0x171e1e1e},
 181 +       {0x0000a09c, 0x02020b0b},
 182 +       {0x0000a0a0, 0x02020202},
 183         {0x0000a0a4, 0x00000000},
 184         {0x0000a0a8, 0x00000000},
 185         {0x0000a0ac, 0x00000000},
 186 @@ -1021,27 +1023,27 @@ static const u32 ar9331_common_rx_gain_1
 187         {0x0000a0b4, 0x00000000},
 188         {0x0000a0b8, 0x00000000},
 189         {0x0000a0bc, 0x00000000},
 190 -       {0x0000a0c0, 0x001f0000},
 191 -       {0x0000a0c4, 0x01000101},
 192 -       {0x0000a0c8, 0x011e011f},
 193 -       {0x0000a0cc, 0x011c011d},
 194 -       {0x0000a0d0, 0x02030204},
 195 -       {0x0000a0d4, 0x02010202},
 196 -       {0x0000a0d8, 0x021f0200},
 197 -       {0x0000a0dc, 0x0302021e},
 198 -       {0x0000a0e0, 0x03000301},
 199 -       {0x0000a0e4, 0x031e031f},
 200 -       {0x0000a0e8, 0x0402031d},
 201 -       {0x0000a0ec, 0x04000401},
 202 -       {0x0000a0f0, 0x041e041f},
 203 -       {0x0000a0f4, 0x0502041d},
 204 -       {0x0000a0f8, 0x05000501},
 205 -       {0x0000a0fc, 0x051e051f},
 206 -       {0x0000a100, 0x06010602},
 207 -       {0x0000a104, 0x061f0600},
 208 -       {0x0000a108, 0x061d061e},
 209 -       {0x0000a10c, 0x07020703},
 210 -       {0x0000a110, 0x07000701},
 211 +       {0x0000a0c0, 0x22072208},
 212 +       {0x0000a0c4, 0x22052206},
 213 +       {0x0000a0c8, 0x22032204},
 214 +       {0x0000a0cc, 0x22012202},
 215 +       {0x0000a0d0, 0x221f2200},
 216 +       {0x0000a0d4, 0x221d221e},
 217 +       {0x0000a0d8, 0x33023303},
 218 +       {0x0000a0dc, 0x33003301},
 219 +       {0x0000a0e0, 0x331e331f},
 220 +       {0x0000a0e4, 0x4402331d},
 221 +       {0x0000a0e8, 0x44004401},
 222 +       {0x0000a0ec, 0x441e441f},
 223 +       {0x0000a0f0, 0x55025503},
 224 +       {0x0000a0f4, 0x55005501},
 225 +       {0x0000a0f8, 0x551e551f},
 226 +       {0x0000a0fc, 0x6602551d},
 227 +       {0x0000a100, 0x66006601},
 228 +       {0x0000a104, 0x661e661f},
 229 +       {0x0000a108, 0x7703661d},
 230 +       {0x0000a10c, 0x77017702},
 231 +       {0x0000a110, 0x00007700},
 232         {0x0000a114, 0x00000000},
 233         {0x0000a118, 0x00000000},
 234         {0x0000a11c, 0x00000000},
 235 @@ -1054,26 +1056,26 @@ static const u32 ar9331_common_rx_gain_1
 236         {0x0000a138, 0x00000000},
 237         {0x0000a13c, 0x00000000},
 238         {0x0000a140, 0x001f0000},
 239 -       {0x0000a144, 0x01000101},
 240 -       {0x0000a148, 0x011e011f},
 241 -       {0x0000a14c, 0x011c011d},
 242 -       {0x0000a150, 0x02030204},
 243 -       {0x0000a154, 0x02010202},
 244 -       {0x0000a158, 0x021f0200},
 245 -       {0x0000a15c, 0x0302021e},
 246 -       {0x0000a160, 0x03000301},
 247 -       {0x0000a164, 0x031e031f},
 248 -       {0x0000a168, 0x0402031d},
 249 -       {0x0000a16c, 0x04000401},
 250 -       {0x0000a170, 0x041e041f},
 251 -       {0x0000a174, 0x0502041d},
 252 -       {0x0000a178, 0x05000501},
 253 -       {0x0000a17c, 0x051e051f},
 254 -       {0x0000a180, 0x06010602},
 255 -       {0x0000a184, 0x061f0600},
 256 -       {0x0000a188, 0x061d061e},
 257 -       {0x0000a18c, 0x07020703},
 258 -       {0x0000a190, 0x07000701},
 259 +       {0x0000a144, 0x111f1100},
 260 +       {0x0000a148, 0x111d111e},
 261 +       {0x0000a14c, 0x111b111c},
 262 +       {0x0000a150, 0x22032204},
 263 +       {0x0000a154, 0x22012202},
 264 +       {0x0000a158, 0x221f2200},
 265 +       {0x0000a15c, 0x221d221e},
 266 +       {0x0000a160, 0x33013302},
 267 +       {0x0000a164, 0x331f3300},
 268 +       {0x0000a168, 0x4402331e},
 269 +       {0x0000a16c, 0x44004401},
 270 +       {0x0000a170, 0x441e441f},
 271 +       {0x0000a174, 0x55015502},
 272 +       {0x0000a178, 0x551f5500},
 273 +       {0x0000a17c, 0x6602551e},
 274 +       {0x0000a180, 0x66006601},
 275 +       {0x0000a184, 0x661e661f},
 276 +       {0x0000a188, 0x7703661d},
 277 +       {0x0000a18c, 0x77017702},
 278 +       {0x0000a190, 0x00007700},
 279         {0x0000a194, 0x00000000},
 280         {0x0000a198, 0x00000000},
 281         {0x0000a19c, 0x00000000},
 282 @@ -1100,14 +1102,14 @@ static const u32 ar9331_common_rx_gain_1
 283         {0x0000a1f0, 0x00000396},
 284         {0x0000a1f4, 0x00000396},
 285         {0x0000a1f8, 0x00000396},
 286 -       {0x0000a1fc, 0x00000196},
 287 +       {0x0000a1fc, 0x00000296},
 288  };
 289
 290  static const u32 ar9331_common_tx_gain_offset1_1[][1] = {
 291 -       {0},
 292 -       {3},
 293 -       {0},
 294 -       {0},
 295 +       {0x00000000},
 296 +       {0x00000003},
 297 +       {0x00000000},
 298 +       {0x00000000},
 299  };
 300
 301  static const u32 ar9331_1p1_chansel_xtal_25M[] = {