package/kernel/mac80211/patches/610-rt2x00-fix-rt3352-ext-pa.patch

   1 --- a/drivers/net/wireless/rt2x00/rt2800lib.c
   2 +++ b/drivers/net/wireless/rt2x00/rt2800lib.c
   3 @@ -3552,11 +3552,18 @@ static void rt2800_config_channel(struct
   4         /*
   5          * Change BBP settings
   6          */
   7 +
   8         if (rt2x00_rt(rt2x00dev, RT3352)) {
   9 +               rt2800_bbp_write(rt2x00dev, 62, 0x37 - rt2x00dev->lna_gain);
  10 +               rt2800_bbp_write(rt2x00dev, 63, 0x37 - rt2x00dev->lna_gain);
  11 +               rt2800_bbp_write(rt2x00dev, 64, 0x37 - rt2x00dev->lna_gain);
  12 +
  13                 rt2800_bbp_write(rt2x00dev, 27, 0x0);
  14                 rt2800_bbp_write(rt2x00dev, 66, 0x26 + rt2x00dev->lna_gain);
  15                 rt2800_bbp_write(rt2x00dev, 27, 0x20);
  16                 rt2800_bbp_write(rt2x00dev, 66, 0x26 + rt2x00dev->lna_gain);
  17 +               rt2800_bbp_write(rt2x00dev, 86, 0x38);
  18 +               rt2800_bbp_write(rt2x00dev, 83, 0x6a);
  19         } else if (rt2x00_rt(rt2x00dev, RT3593)) {
  20                 if (rf->channel > 14) {
  21                         /* Disable CCK Packet detection on 5GHz */
  22 @@ -6618,6 +6625,12 @@ static void rt2800_init_rfcsr_3290(struc
  23
  24  static void rt2800_init_rfcsr_3352(struct rt2x00_dev *rt2x00dev)
  25  {
  26 +       int tx0_int_pa = test_bit(CAPABILITY_INTERNAL_PA_TX0,
  27 +                                 &rt2x00dev->cap_flags);
  28 +       int tx1_int_pa = test_bit(CAPABILITY_INTERNAL_PA_TX1,
  29 +                                 &rt2x00dev->cap_flags);
  30 +       u8 rfcsr;
  31 +
  32         rt2800_rf_init_calibration(rt2x00dev, 30);
  33
  34         rt2800_rfcsr_write(rt2x00dev, 0, 0xf0);
  35 @@ -6653,15 +6666,30 @@ static void rt2800_init_rfcsr_3352(struc
  36         rt2800_rfcsr_write(rt2x00dev, 31, 0x80);
  37         rt2800_rfcsr_write(rt2x00dev, 32, 0x80);
  38         rt2800_rfcsr_write(rt2x00dev, 33, 0x00);
  39 -       rt2800_rfcsr_write(rt2x00dev, 34, 0x01);
  40 +       rfcsr = 0x01;
  41 +       if (!tx0_int_pa)
  42 +               rt2x00_set_field8(&rfcsr, RFCSR34_TX0_EXT_PA, 1);
  43 +       if (!tx1_int_pa)
  44 +               rt2x00_set_field8(&rfcsr, RFCSR34_TX1_EXT_PA, 1);
  45 +       rt2800_rfcsr_write(rt2x00dev, 34, rfcsr);
  46         rt2800_rfcsr_write(rt2x00dev, 35, 0x03);
  47         rt2800_rfcsr_write(rt2x00dev, 36, 0xbd);
  48         rt2800_rfcsr_write(rt2x00dev, 37, 0x3c);
  49         rt2800_rfcsr_write(rt2x00dev, 38, 0x5f);
  50         rt2800_rfcsr_write(rt2x00dev, 39, 0xc5);
  51         rt2800_rfcsr_write(rt2x00dev, 40, 0x33);
  52 -       rt2800_rfcsr_write(rt2x00dev, 41, 0x5b);
  53 -       rt2800_rfcsr_write(rt2x00dev, 42, 0x5b);
  54 +       rfcsr = 0x52;
  55 +       if (tx0_int_pa) {
  56 +               rt2x00_set_field8(&rfcsr, RFCSR41_BIT1, 1);
  57 +               rt2x00_set_field8(&rfcsr, RFCSR41_BIT4, 1);
  58 +       }
  59 +       rt2800_rfcsr_write(rt2x00dev, 41, rfcsr);
  60 +       rfcsr = 0x52;
  61 +       if (tx1_int_pa) {
  62 +               rt2x00_set_field8(&rfcsr, RFCSR42_BIT1, 1);
  63 +               rt2x00_set_field8(&rfcsr, RFCSR42_BIT4, 1);
  64 +       }
  65 +       rt2800_rfcsr_write(rt2x00dev, 42, rfcsr);
  66         rt2800_rfcsr_write(rt2x00dev, 43, 0xdb);
  67         rt2800_rfcsr_write(rt2x00dev, 44, 0xdb);
  68         rt2800_rfcsr_write(rt2x00dev, 45, 0xdb);
  69 @@ -6669,15 +6697,20 @@ static void rt2800_init_rfcsr_3352(struc
  70         rt2800_rfcsr_write(rt2x00dev, 47, 0x0d);
  71         rt2800_rfcsr_write(rt2x00dev, 48, 0x14);
  72         rt2800_rfcsr_write(rt2x00dev, 49, 0x00);
  73 -       rt2800_rfcsr_write(rt2x00dev, 50, 0x2d);
  74 -       rt2800_rfcsr_write(rt2x00dev, 51, 0x7f);
  75 -       rt2800_rfcsr_write(rt2x00dev, 52, 0x00);
  76 -       rt2800_rfcsr_write(rt2x00dev, 53, 0x52);
  77 -       rt2800_rfcsr_write(rt2x00dev, 54, 0x1b);
  78 -       rt2800_rfcsr_write(rt2x00dev, 55, 0x7f);
  79 -       rt2800_rfcsr_write(rt2x00dev, 56, 0x00);
  80 -       rt2800_rfcsr_write(rt2x00dev, 57, 0x52);
  81 -       rt2800_rfcsr_write(rt2x00dev, 58, 0x1b);
  82 +       rfcsr = 0x2d;
  83 +       if (!tx0_int_pa)
  84 +               rt2x00_set_field8(&rfcsr, RFCSR50_TX0_EXT_PA, 1);
  85 +       if (!tx1_int_pa)
  86 +               rt2x00_set_field8(&rfcsr, RFCSR50_TX1_EXT_PA, 1);
  87 +       rt2800_rfcsr_write(rt2x00dev, 50, rfcsr);
  88 +       rt2800_rfcsr_write(rt2x00dev, 51, (tx0_int_pa ? 0x7f : 0x52));
  89 +       rt2800_rfcsr_write(rt2x00dev, 52, (tx0_int_pa ? 0x00 : 0xc0));
  90 +       rt2800_rfcsr_write(rt2x00dev, 53, (tx0_int_pa ? 0x52 : 0xd2));
  91 +       rt2800_rfcsr_write(rt2x00dev, 54, (tx0_int_pa ? 0x1b : 0xc0));
  92 +       rt2800_rfcsr_write(rt2x00dev, 55, (tx1_int_pa ? 0x7f : 0x52));
  93 +       rt2800_rfcsr_write(rt2x00dev, 56, (tx1_int_pa ? 0x00 : 0xc0));
  94 +       rt2800_rfcsr_write(rt2x00dev, 57, (tx0_int_pa ? 0x52 : 0x49));
  95 +       rt2800_rfcsr_write(rt2x00dev, 58, (tx1_int_pa ? 0x1b : 0xc0));
  96         rt2800_rfcsr_write(rt2x00dev, 59, 0x00);
  97         rt2800_rfcsr_write(rt2x00dev, 60, 0x00);
  98         rt2800_rfcsr_write(rt2x00dev, 61, 0x00);
  99 @@ -7698,6 +7731,7 @@ static int rt2800_init_eeprom(struct rt2
 100          * RT53xx: defined in "EEPROM_CHIP_ID" field
 101          */
 102         if (rt2x00_rt(rt2x00dev, RT3290) ||
 103 +           rt2x00_rt(rt2x00dev, RT3352) ||
 104             rt2x00_rt(rt2x00dev, RT5390) ||
 105             rt2x00_rt(rt2x00dev, RT5392))
 106                 rt2800_eeprom_read(rt2x00dev, EEPROM_CHIP_ID, &rf);
 107 @@ -7793,7 +7827,8 @@ static int rt2800_init_eeprom(struct rt2
 108         /*
 109          * Detect if this device has Bluetooth co-existence.
 110          */
 111 -       if (rt2x00_get_field16(eeprom, EEPROM_NIC_CONF1_BT_COEXIST))
 112 +       if (!rt2x00_rt(rt2x00dev, RT3352) &&
 113 +           rt2x00_get_field16(eeprom, EEPROM_NIC_CONF1_BT_COEXIST))
 114                 __set_bit(CAPABILITY_BT_COEXIST, &rt2x00dev->cap_flags);
 115
 116         /*
 117 @@ -7822,6 +7857,22 @@ static int rt2800_init_eeprom(struct rt2
 118                                         EIRP_MAX_TX_POWER_LIMIT)
 119                 __set_bit(CAPABILITY_POWER_LIMIT, &rt2x00dev->cap_flags);
 120
 121 +       /*
 122 +        * Detect if device uses internal or external PA
 123 +        */
 124 +       rt2800_eeprom_read(rt2x00dev, EEPROM_NIC_CONF1, &eeprom);
 125 +
 126 +       if (rt2x00_rt(rt2x00dev, RT3352)) {
 127 +               if (!rt2x00_get_field16(eeprom,
 128 +                   EEPROM_NIC_CONF1_EXTERNAL_TX0_PA_3352))
 129 +                       __set_bit(CAPABILITY_INTERNAL_PA_TX0,
 130 +                                 &rt2x00dev->cap_flags);
 131 +               if (!rt2x00_get_field16(eeprom,
 132 +                   EEPROM_NIC_CONF1_EXTERNAL_TX1_PA_3352))
 133 +                       __set_bit(CAPABILITY_INTERNAL_PA_TX1,
 134 +                                 &rt2x00dev->cap_flags);
 135 +       }
 136 +
 137         return 0;
 138  }
 139
 140 --- a/drivers/net/wireless/rt2x00/rt2800.h
 141 +++ b/drivers/net/wireless/rt2x00/rt2800.h
 142 @@ -2335,6 +2335,12 @@ struct mac_iveiv_entry {
 143  #define RFCSR36_RF_BS                  FIELD8(0x80)
 144
 145  /*
 146 + * RFCSR 34:
 147 + */
 148 +#define RFCSR34_TX0_EXT_PA             FIELD8(0x04)
 149 +#define RFCSR34_TX1_EXT_PA             FIELD8(0x08)
 150 +
 151 +/*
 152   * RFCSR 38:
 153   */
 154  #define RFCSR38_RX_LO1_EN              FIELD8(0x20)
 155 @@ -2346,6 +2352,18 @@ struct mac_iveiv_entry {
 156  #define RFCSR39_RX_LO2_EN              FIELD8(0x80)
 157
 158  /*
 159 + * RFCSR 41:
 160 + */
 161 +#define RFCSR41_BIT1                   FIELD8(0x01)
 162 +#define RFCSR41_BIT4                   FIELD8(0x08)
 163 +
 164 +/*
 165 + * RFCSR 42:
 166 + */
 167 +#define RFCSR42_BIT1                   FIELD8(0x01)
 168 +#define RFCSR42_BIT4                   FIELD8(0x08)
 169 +
 170 +/*
 171   * RFCSR 49:
 172   */
 173  #define RFCSR49_TX                     FIELD8(0x3f)
 174 @@ -2358,6 +2376,8 @@ struct mac_iveiv_entry {
 175   * RFCSR 50:
 176   */
 177  #define RFCSR50_TX                     FIELD8(0x3f)
 178 +#define RFCSR50_TX0_EXT_PA             FIELD8(0x02)
 179 +#define RFCSR50_TX1_EXT_PA             FIELD8(0x10)
 180  #define RFCSR50_EP                     FIELD8(0xc0)
 181  /* bits for RT3593 */
 182  #define RFCSR50_TX_LO1_EN              FIELD8(0x20)
 183 @@ -2505,6 +2525,8 @@ enum rt2800_eeprom_word {
 184   * INTERNAL_TX_ALC: 0: disable, 1: enable
 185   * BT_COEXIST: 0: disable, 1: enable
 186   * DAC_TEST: 0: disable, 1: enable
 187 + * EXTERNAL_TX0_PA: 0: disable, 1: enable (only on RT3352)
 188 + * EXTERNAL_TX1_PA: 0: disable, 1: enable (only on RT3352)
 189   */
 190  #define EEPROM_NIC_CONF1_HW_RADIO              FIELD16(0x0001)
 191  #define EEPROM_NIC_CONF1_EXTERNAL_TX_ALC       FIELD16(0x0002)
 192 @@ -2521,6 +2543,8 @@ enum rt2800_eeprom_word {
 193  #define EEPROM_NIC_CONF1_INTERNAL_TX_ALC       FIELD16(0x2000)
 194  #define EEPROM_NIC_CONF1_BT_COEXIST            FIELD16(0x4000)
 195  #define EEPROM_NIC_CONF1_DAC_TEST              FIELD16(0x8000)
 196 +#define EEPROM_NIC_CONF1_EXTERNAL_TX0_PA_3352  FIELD16(0x4000)
 197 +#define EEPROM_NIC_CONF1_EXTERNAL_TX1_PA_3352  FIELD16(0x8000)
 198
 199  /*
 200   * EEPROM frequency
 201 --- a/drivers/net/wireless/rt2x00/rt2x00.h
 202 +++ b/drivers/net/wireless/rt2x00/rt2x00.h
 203 @@ -715,6 +715,8 @@ enum rt2x00_capability_flags {
 204         CAPABILITY_DOUBLE_ANTENNA,
 205         CAPABILITY_BT_COEXIST,
 206         CAPABILITY_VCO_RECALIBRATION,
 207 +       CAPABILITY_INTERNAL_PA_TX0,
 208 +       CAPABILITY_INTERNAL_PA_TX1,
 209  };
 210
 211  /*