650-rt2x00-add-support-for-external-PA-on-MT7620.patch 3.9 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107
  1. From 9782a7f7488443568fa4d6088b73c9aff7eb8510 Mon Sep 17 00:00:00 2001
  2. From: Daniel Golle <[email protected]>
  3. Date: Wed, 19 Apr 2017 16:14:53 +0200
  4. Subject: [PATCH] rt2x00: add support for external PA on MT7620
  5. To: Stanislaw Gruszka <[email protected]>
  6. Cc: Helmut Schaa <[email protected]>,
  7. [email protected],
  8. Kalle Valo <[email protected]>
  9. Content-Type: text/plain; charset="UTF-8"
  10. Content-Transfer-Encoding: quoted-printable
  11. Signed-off-by: Daniel Golle <[email protected]>
  12. Signed-off-by: Tomislav Po=C5=BEega <[email protected]>
  13. [[email protected]: use chanreg and dccal helpers.]
  14. ---
  15. drivers/net/wireless/ralink/rt2x00/rt2800.h | 1 +
  16. drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 70 +++++++++++++++++++++++++-
  17. 2 files changed, 70 insertions(+), 1 deletion(-)
  18. --- a/drivers/net/wireless/ralink/rt2x00/rt2800.h
  19. +++ b/drivers/net/wireless/ralink/rt2x00/rt2800.h
  20. @@ -2750,6 +2750,7 @@ enum rt2800_eeprom_word {
  21. #define EEPROM_NIC_CONF2_RX_STREAM FIELD16(0x000f)
  22. #define EEPROM_NIC_CONF2_TX_STREAM FIELD16(0x00f0)
  23. #define EEPROM_NIC_CONF2_CRYSTAL FIELD16(0x0600)
  24. +#define EEPROM_NIC_CONF2_EXTERNAL_PA FIELD16(0xc000)
  25. /*
  26. * EEPROM LNA
  27. --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
  28. +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
  29. @@ -4290,6 +4290,45 @@ static void rt2800_config_channel(struct
  30. rt2800_iq_calibrate(rt2x00dev, rf->channel);
  31. }
  32. + if (rt2x00_rt(rt2x00dev, RT6352)) {
  33. + if (test_bit(CAPABILITY_EXTERNAL_PA_TX0,
  34. + &rt2x00dev->cap_flags)) {
  35. + rt2x00_warn(rt2x00dev, "Using incomplete support for " \
  36. + "external PA\n");
  37. + reg = rt2800_register_read(rt2x00dev, RF_CONTROL3);
  38. + reg |= 0x00000101;
  39. + rt2800_register_write(rt2x00dev, RF_CONTROL3, reg);
  40. +
  41. + reg = rt2800_register_read(rt2x00dev, RF_BYPASS3);
  42. + reg |= 0x00000101;
  43. + rt2800_register_write(rt2x00dev, RF_BYPASS3, reg);
  44. +
  45. + rt2800_rfcsr_write_chanreg(rt2x00dev, 43, 0x73);
  46. + rt2800_rfcsr_write_chanreg(rt2x00dev, 44, 0x73);
  47. + rt2800_rfcsr_write_chanreg(rt2x00dev, 45, 0x73);
  48. + rt2800_rfcsr_write_chanreg(rt2x00dev, 46, 0x27);
  49. + rt2800_rfcsr_write_chanreg(rt2x00dev, 47, 0xC8);
  50. + rt2800_rfcsr_write_chanreg(rt2x00dev, 48, 0xA4);
  51. + rt2800_rfcsr_write_chanreg(rt2x00dev, 49, 0x05);
  52. + rt2800_rfcsr_write_chanreg(rt2x00dev, 54, 0x27);
  53. + rt2800_rfcsr_write_chanreg(rt2x00dev, 55, 0xC8);
  54. + rt2800_rfcsr_write_chanreg(rt2x00dev, 56, 0xA4);
  55. + rt2800_rfcsr_write_chanreg(rt2x00dev, 57, 0x05);
  56. + rt2800_rfcsr_write_chanreg(rt2x00dev, 58, 0x27);
  57. + rt2800_rfcsr_write_chanreg(rt2x00dev, 59, 0xC8);
  58. + rt2800_rfcsr_write_chanreg(rt2x00dev, 60, 0xA4);
  59. + rt2800_rfcsr_write_chanreg(rt2x00dev, 61, 0x05);
  60. + rt2800_rfcsr_write_dccal(rt2x00dev, 05, 0x00);
  61. +
  62. + rt2800_register_write(rt2x00dev, TX0_RF_GAIN_CORRECT,
  63. + 0x36303636);
  64. + rt2800_register_write(rt2x00dev, TX0_RF_GAIN_ATTEN,
  65. + 0x6C6C6B6C);
  66. + rt2800_register_write(rt2x00dev, TX1_RF_GAIN_ATTEN,
  67. + 0x6C6C6B6C);
  68. + }
  69. + }
  70. +
  71. bbp = rt2800_bbp_read(rt2x00dev, 4);
  72. rt2x00_set_field8(&bbp, BBP4_BANDWIDTH, 2 * conf_is_ht40(conf));
  73. rt2800_bbp_write(rt2x00dev, 4, bbp);
  74. @@ -9487,7 +9526,8 @@ static int rt2800_init_eeprom(struct rt2
  75. */
  76. eeprom = rt2800_eeprom_read(rt2x00dev, EEPROM_NIC_CONF1);
  77. - if (rt2x00_rt(rt2x00dev, RT3352)) {
  78. + if (rt2x00_rt(rt2x00dev, RT3352) ||
  79. + rt2x00_rt(rt2x00dev, RT6352)) {
  80. if (rt2x00_get_field16(eeprom,
  81. EEPROM_NIC_CONF1_EXTERNAL_TX0_PA_3352))
  82. __set_bit(CAPABILITY_EXTERNAL_PA_TX0,
  83. @@ -9498,6 +9538,18 @@ static int rt2800_init_eeprom(struct rt2
  84. &rt2x00dev->cap_flags);
  85. }
  86. + eeprom = rt2800_eeprom_read(rt2x00dev, EEPROM_NIC_CONF2);
  87. +
  88. + if (rt2x00_rt(rt2x00dev, RT6352) && eeprom != 0 && eeprom != 0xffff) {
  89. + if (rt2x00_get_field16(eeprom,
  90. + EEPROM_NIC_CONF2_EXTERNAL_PA)) {
  91. + __set_bit(CAPABILITY_EXTERNAL_PA_TX0,
  92. + &rt2x00dev->cap_flags);
  93. + __set_bit(CAPABILITY_EXTERNAL_PA_TX1,
  94. + &rt2x00dev->cap_flags);
  95. + }
  96. + }
  97. +
  98. return 0;
  99. }