Home Explore Help
Register Sign In
OpenWrt
/
openwrt
mirror of https://github.com/openwrt/openwrt.git
2
0
Fork 0
Files Issues 0 Wiki
Tree: 1114f5dc10
Branches Tags
openwrt
/
package
/
kernel
/
mac80211
/
patches
/
020-20-rt2x00-reverse-external-PA-capability-flag-logic.patch

020-20-rt2x00-reverse-external-PA-capability-flag-logic.patch 4.8 KB
History Raw

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121 
  1. From 1f242a3de702d5a19c479685d35b050837122724 Mon Sep 17 00:00:00 2001
    2. 

  2. From: Daniel Golle <[email protected]>
    3. 

  3. Date: Mon, 10 Apr 2017 15:29:45 +0200
    4. 

  4. Subject: [PATCH] rt2x00: reverse external PA capability flag logic
    5. 

  5. 

  6. Consequently refer to external PA instead of inverting the logic and
    7. 

  7. use an internal PA capability flag which is a bit confusing.
    8. 

  8. Currently this is used for Rt3352 only, but MT7620A also allows for an
    9. 

  9. external PA which will be supported by a follow up patch.
    10. 

  10. 

  11. Signed-off-by: Daniel Golle <[email protected]>
    12. 

  12. Acked-by: Stanislaw Gruszka <[email protected]>
    13. 

  13. Signed-off-by: Kalle Valo <[email protected]>
    14. 

  14. ---
    15. 

  15.  drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 40 +++++++++++++-------------
    16. 

  16.  drivers/net/wireless/ralink/rt2x00/rt2x00.h    |  4 +--
    17. 

  17.  2 files changed, 22 insertions(+), 22 deletions(-)
    18. 

  18. 

  19. --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
    20. 

  20. +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
    21. 

  21. @@ -7014,9 +7014,9 @@ static void rt2800_init_rfcsr_3290(struc
    22. 

  22.  
    23. 

  23.  static void rt2800_init_rfcsr_3352(struct rt2x00_dev *rt2x00dev)
    24. 

  24.  {
    25. 

  25. -	int tx0_int_pa = test_bit(CAPABILITY_INTERNAL_PA_TX0,
    26. 

  26. +	int tx0_ext_pa = test_bit(CAPABILITY_EXTERNAL_PA_TX0,
    27. 

  27.  				  &rt2x00dev->cap_flags);
    28. 

  28. -	int tx1_int_pa = test_bit(CAPABILITY_INTERNAL_PA_TX1,
    29. 

  29. +	int tx1_ext_pa = test_bit(CAPABILITY_EXTERNAL_PA_TX1,
    30. 

  30.  				  &rt2x00dev->cap_flags);
    31. 

  31.  	u8 rfcsr;
    32. 

  32.  
    33. 

  33. @@ -7056,9 +7056,9 @@ static void rt2800_init_rfcsr_3352(struc
    34. 

  34.  	rt2800_rfcsr_write(rt2x00dev, 32, 0x80);
    35. 

  35.  	rt2800_rfcsr_write(rt2x00dev, 33, 0x00);
    36. 

  36.  	rfcsr = 0x01;
    37. 

  37. -	if (!tx0_int_pa)
    38. 

  38. +	if (tx0_ext_pa)
    39. 

  39.  		rt2x00_set_field8(&rfcsr, RFCSR34_TX0_EXT_PA, 1);
    40. 

  40. -	if (!tx1_int_pa)
    41. 

  41. +	if (tx1_ext_pa)
    42. 

  42.  		rt2x00_set_field8(&rfcsr, RFCSR34_TX1_EXT_PA, 1);
    43. 

  43.  	rt2800_rfcsr_write(rt2x00dev, 34, rfcsr);
    44. 

  44.  	rt2800_rfcsr_write(rt2x00dev, 35, 0x03);
    45. 

  45. @@ -7068,13 +7068,13 @@ static void rt2800_init_rfcsr_3352(struc
    46. 

  46.  	rt2800_rfcsr_write(rt2x00dev, 39, 0xc5);
    47. 

  47.  	rt2800_rfcsr_write(rt2x00dev, 40, 0x33);
    48. 

  48.  	rfcsr = 0x52;
    49. 

  49. -	if (tx0_int_pa) {
    50. 

  50. +	if (!tx0_ext_pa) {
    51. 

  51.  		rt2x00_set_field8(&rfcsr, RFCSR41_BIT1, 1);
    52. 

  52.  		rt2x00_set_field8(&rfcsr, RFCSR41_BIT4, 1);
    53. 

  53.  	}
    54. 

  54.  	rt2800_rfcsr_write(rt2x00dev, 41, rfcsr);
    55. 

  55.  	rfcsr = 0x52;
    56. 

  56. -	if (tx1_int_pa) {
    57. 

  57. +	if (!tx1_ext_pa) {
    58. 

  58.  		rt2x00_set_field8(&rfcsr, RFCSR42_BIT1, 1);
    59. 

  59.  		rt2x00_set_field8(&rfcsr, RFCSR42_BIT4, 1);
    60. 

  60.  	}
    61. 

  61. @@ -7087,19 +7087,19 @@ static void rt2800_init_rfcsr_3352(struc
    62. 

  62.  	rt2800_rfcsr_write(rt2x00dev, 48, 0x14);
    63. 

  63.  	rt2800_rfcsr_write(rt2x00dev, 49, 0x00);
    64. 

  64.  	rfcsr = 0x2d;
    65. 

  65. -	if (!tx0_int_pa)
    66. 

  66. +	if (tx0_ext_pa)
    67. 

  67.  		rt2x00_set_field8(&rfcsr, RFCSR50_TX0_EXT_PA, 1);
    68. 

  68. -	if (!tx1_int_pa)
    69. 

  69. +	if (tx1_ext_pa)
    70. 

  70.  		rt2x00_set_field8(&rfcsr, RFCSR50_TX1_EXT_PA, 1);
    71. 

  71.  	rt2800_rfcsr_write(rt2x00dev, 50, rfcsr);
    72. 

  72. -	rt2800_rfcsr_write(rt2x00dev, 51, (tx0_int_pa ? 0x7f : 0x52));
    73. 

  73. -	rt2800_rfcsr_write(rt2x00dev, 52, (tx0_int_pa ? 0x00 : 0xc0));
    74. 

  74. -	rt2800_rfcsr_write(rt2x00dev, 53, (tx0_int_pa ? 0x52 : 0xd2));
    75. 

  75. -	rt2800_rfcsr_write(rt2x00dev, 54, (tx0_int_pa ? 0x1b : 0xc0));
    76. 

  76. -	rt2800_rfcsr_write(rt2x00dev, 55, (tx1_int_pa ? 0x7f : 0x52));
    77. 

  77. -	rt2800_rfcsr_write(rt2x00dev, 56, (tx1_int_pa ? 0x00 : 0xc0));
    78. 

  78. -	rt2800_rfcsr_write(rt2x00dev, 57, (tx0_int_pa ? 0x52 : 0x49));
    79. 

  79. -	rt2800_rfcsr_write(rt2x00dev, 58, (tx1_int_pa ? 0x1b : 0xc0));
    80. 

  80. +	rt2800_rfcsr_write(rt2x00dev, 51, (tx0_ext_pa ? 0x52 : 0x7f));
    81. 

  81. +	rt2800_rfcsr_write(rt2x00dev, 52, (tx0_ext_pa ? 0xc0 : 0x00));
    82. 

  82. +	rt2800_rfcsr_write(rt2x00dev, 53, (tx0_ext_pa ? 0xd2 : 0x52));
    83. 

  83. +	rt2800_rfcsr_write(rt2x00dev, 54, (tx0_ext_pa ? 0xc0 : 0x1b));
    84. 

  84. +	rt2800_rfcsr_write(rt2x00dev, 55, (tx1_ext_pa ? 0x52 : 0x7f));
    85. 

  85. +	rt2800_rfcsr_write(rt2x00dev, 56, (tx1_ext_pa ? 0xc0 : 0x00));
    86. 

  86. +	rt2800_rfcsr_write(rt2x00dev, 57, (tx0_ext_pa ? 0x49 : 0x52));
    87. 

  87. +	rt2800_rfcsr_write(rt2x00dev, 58, (tx1_ext_pa ? 0xc0 : 0x1b));
    88. 

  88.  	rt2800_rfcsr_write(rt2x00dev, 59, 0x00);
    89. 

  89.  	rt2800_rfcsr_write(rt2x00dev, 60, 0x00);
    90. 

  90.  	rt2800_rfcsr_write(rt2x00dev, 61, 0x00);
    91. 

  91. @@ -8782,13 +8782,13 @@ static int rt2800_init_eeprom(struct rt2
    92. 

  92.  	rt2800_eeprom_read(rt2x00dev, EEPROM_NIC_CONF1, &eeprom);
    93. 

  93.  
    94. 

  94.  	if (rt2x00_rt(rt2x00dev, RT3352)) {
    95. 

  95. -		if (!rt2x00_get_field16(eeprom,
    96. 

  96. +		if (rt2x00_get_field16(eeprom,
    97. 

  97.  		    EEPROM_NIC_CONF1_EXTERNAL_TX0_PA_3352))
    98. 

  98. -		    __set_bit(CAPABILITY_INTERNAL_PA_TX0,
    99. 

  99. +		    __set_bit(CAPABILITY_EXTERNAL_PA_TX0,
    100. 

  100.  			      &rt2x00dev->cap_flags);
    101. 

  101. -		if (!rt2x00_get_field16(eeprom,
    102. 

  102. +		if (rt2x00_get_field16(eeprom,
    103. 

  103.  		    EEPROM_NIC_CONF1_EXTERNAL_TX1_PA_3352))
    104. 

  104. -		    __set_bit(CAPABILITY_INTERNAL_PA_TX1,
    105. 

  105. +		    __set_bit(CAPABILITY_EXTERNAL_PA_TX1,
    106. 

  106.  			      &rt2x00dev->cap_flags);
    107. 

  107.  	}
    108. 

  108.  
    109. 

  109. --- a/drivers/net/wireless/ralink/rt2x00/rt2x00.h
    110. 

  110. +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00.h
    111. 

  111. @@ -719,8 +719,8 @@ enum rt2x00_capability_flags {
    112. 

  112.  	CAPABILITY_DOUBLE_ANTENNA,
    113. 

  113.  	CAPABILITY_BT_COEXIST,
    114. 

  114.  	CAPABILITY_VCO_RECALIBRATION,
    115. 

  115. -	CAPABILITY_INTERNAL_PA_TX0,
    116. 

  116. -	CAPABILITY_INTERNAL_PA_TX1,
    117. 

  117. +	CAPABILITY_EXTERNAL_PA_TX0,
    118. 

  118. +	CAPABILITY_EXTERNAL_PA_TX1,
    119. 

  119.  };
    120. 

  120.  
    121. 

  121.  /*
    122.