982-rt2x00-add-rf-self-txdc-calibration.patch 3.3 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980818283848586878889
  1. --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
  2. +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
  3. @@ -8331,6 +8331,58 @@ static void rt2800_init_rfcsr_5592(struc
  4. rt2800_led_open_drain_enable(rt2x00dev);
  5. }
  6. +void rt2800_rf_self_txdc_cal(struct rt2x00_dev *rt2x00dev)
  7. +{
  8. + u8 rfb5r1_org, rfb7r1_org, rfvalue;
  9. + u32 mac0518, mac051c, mac0528, mac052c;
  10. + u8 i;
  11. +
  12. + rt2x00_info(rt2x00dev, "RF Tx self calibration start\n");
  13. + mac0518 = rt2800_register_read(rt2x00dev, RF_CONTROL0);
  14. + mac051c = rt2800_register_read(rt2x00dev, RF_BYPASS0);
  15. + mac0528 = rt2800_register_read(rt2x00dev, RF_CONTROL2);
  16. + mac052c = rt2800_register_read(rt2x00dev, RF_BYPASS2);
  17. +
  18. + rt2800_register_write(rt2x00dev, RF_BYPASS0, 0x0);
  19. + rt2800_register_write(rt2x00dev, RF_BYPASS2, 0x0);
  20. +
  21. + rt2800_register_write(rt2x00dev, RF_CONTROL0, 0xC);
  22. + rt2800_register_write(rt2x00dev, RF_BYPASS0, 0x3306);
  23. + rt2800_register_write(rt2x00dev, RF_CONTROL2, 0x3330);
  24. + rt2800_register_write(rt2x00dev, RF_BYPASS2, 0xfffff);
  25. + rfb5r1_org = rt2800_rfcsr_read_bank(rt2x00dev, 5, 1);
  26. + rfb7r1_org = rt2800_rfcsr_read_bank(rt2x00dev, 7, 1);
  27. +
  28. + rt2800_rfcsr_write_bank(rt2x00dev, 5, 1, 0x4);
  29. + for (i = 0; i < 100; i = i + 1) {
  30. + udelay(50);
  31. + rfvalue = rt2800_rfcsr_read_bank(rt2x00dev, 5, 1);
  32. + if((rfvalue & 0x04) != 0x4)
  33. + break;
  34. + }
  35. + rt2800_rfcsr_write_bank(rt2x00dev, 5, 1, rfb5r1_org);
  36. +
  37. + rt2800_rfcsr_write_bank(rt2x00dev, 7, 1, 0x4);
  38. + for (i = 0; i < 100; i = i + 1) {
  39. + udelay(50);
  40. + rfvalue = rt2800_rfcsr_read_bank(rt2x00dev, 7, 1);
  41. + if((rfvalue & 0x04) != 0x4)
  42. + break;
  43. + }
  44. + rt2800_rfcsr_write_bank(rt2x00dev, 7, 1, rfb7r1_org);
  45. +
  46. + rt2800_register_write(rt2x00dev, RF_BYPASS0, 0x0);
  47. + rt2800_register_write(rt2x00dev, RF_BYPASS2, 0x0);
  48. + rt2800_register_write(rt2x00dev, RF_CONTROL0, mac0518);
  49. + rt2800_register_write(rt2x00dev, RF_BYPASS0, mac051c);
  50. + rt2800_register_write(rt2x00dev, RF_CONTROL2, mac0528);
  51. + rt2800_register_write(rt2x00dev, RF_BYPASS2, mac052c);
  52. +
  53. + rt2x00_info(rt2x00dev, "RF Tx self calibration end\n");
  54. +
  55. +}
  56. +EXPORT_SYMBOL_GPL(rt2800_rf_self_txdc_cal);
  57. +
  58. static void rt2800_bbp_core_soft_reset(struct rt2x00_dev *rt2x00dev,
  59. bool set_bw, bool is_ht40)
  60. {
  61. @@ -8956,6 +9008,7 @@ static void rt2800_init_rfcsr_6352(struc
  62. rt2800_rfcsr_write_dccal(rt2x00dev, 5, 0x00);
  63. rt2800_rfcsr_write_dccal(rt2x00dev, 17, 0x7C);
  64. + rt2800_rf_self_txdc_cal(rt2x00dev);
  65. rt2800_bw_filter_calibration(rt2x00dev, true);
  66. rt2800_bw_filter_calibration(rt2x00dev, false);
  67. }
  68. --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.h
  69. +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.h
  70. @@ -242,6 +242,7 @@ void rt2800_link_tuner(struct rt2x00_dev
  71. const u32 count);
  72. void rt2800_gain_calibration(struct rt2x00_dev *rt2x00dev);
  73. void rt2800_vco_calibration(struct rt2x00_dev *rt2x00dev);
  74. +void rt2800_rf_self_txdc_cal(struct rt2x00_dev *rt2x00dev);
  75. int rt2800_enable_radio(struct rt2x00_dev *rt2x00dev);
  76. void rt2800_disable_radio(struct rt2x00_dev *rt2x00dev);
  77. --- a/drivers/net/wireless/ralink/rt2x00/rt2x00.h
  78. +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00.h
  79. @@ -572,6 +572,7 @@ struct rt2x00lib_ops {
  80. struct link_qual *qual, const u32 count);
  81. void (*gain_calibration) (struct rt2x00_dev *rt2x00dev);
  82. void (*vco_calibration) (struct rt2x00_dev *rt2x00dev);
  83. + void (*rf_self_txdc_cal) (struct rt2x00_dev *rt2x00dev);
  84. /*
  85. * Data queue handlers.