2015-12-04 22:39:37 +00:00
|
|
|
--- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
|
|
|
|
|
+++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
|
2019-07-06 22:08:20 +00:00
|
|
|
@@ -25,6 +25,7 @@
|
2017-02-02 11:02:22 +00:00
|
|
|
#include <linux/kernel.h>
|
2013-07-29 22:45:57 +00:00
|
|
|
#include <linux/module.h>
|
|
|
|
|
#include <linux/slab.h>
|
|
|
|
|
+#include <linux/of.h>
|
|
|
|
|
|
|
|
|
|
#include "rt2x00.h"
|
|
|
|
|
#include "rt2800lib.h"
|
mac80211: rt2x00: remove errornous duplicate condition
https://patchwork.kernel.org/patch/11224189/
--
On 2019-10-28 06:07, wbob wrote:
> Hello Roman,
>
> while reading around drivers/net/wireless/ralink/rt2x00/rt2800lib.c
> I stumbled on what I think is an edit of yours made in error in march
> 2017:
>
> https://github.com/torvalds/linux/commit/41977e86#diff-dae5dc10da180f3b055809a48118e18aR5281
>
> RT6352 in line 5281 should not have been introduced as the "else if"
> below line 5291 can then not take effect for a RT6352 device. Another
> possibility is for line 5291 to be not for RT6352, but this seems
> very unlikely. Are you able to clarify still after this substantial time?
>
> 5277: static int rt2800_init_registers(struct rt2x00_dev *rt2x00dev)
> ...
> 5279: } else if (rt2x00_rt(rt2x00dev, RT5390) ||
> 5280: rt2x00_rt(rt2x00dev, RT5392) ||
> 5281: rt2x00_rt(rt2x00dev, RT6352)) {
> ...
> 5291: } else if (rt2x00_rt(rt2x00dev, RT6352)) {
> ...
Hence remove errornous line 5281 to make the driver actually
execute the correct initialization routine for MT7620 chips.
As it was requested by Stanislaw Gruszka remove setting values of
MIMO_PS_CFG and TX_PIN_CFG. MIMO_PS_CFG is responsible for MIMO
power-safe mode (which is disabled), hence we can drop setting it.
TX_PIN_CFG is set correctly in other functions, and as setting this
value breaks some devices, rather don't set it here during init, but
only modify it later on.
Fixes: 41977e86c984 ("rt2x00: add support for MT7620")
Reported-by: wbob <wbob@jify.de>
Reported-by: Roman Yeryomin <roman@advem.lv>
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Acked-by: Stanislaw Gruszka <sgruszka@redhat.com>
--
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2019-11-03 17:31:02 +00:00
|
|
|
@@ -9531,6 +9532,17 @@ static int rt2800_init_eeprom(struct rt2
|
2013-07-29 13:09:16 +00:00
|
|
|
rt2800_init_led(rt2x00dev, &rt2x00dev->led_assoc, LED_TYPE_ASSOC);
|
|
|
|
|
rt2800_init_led(rt2x00dev, &rt2x00dev->led_qual, LED_TYPE_QUALITY);
|
|
|
|
|
|
2013-08-05 09:09:41 +00:00
|
|
|
+ {
|
|
|
|
|
+ struct device_node *np = rt2x00dev->dev->of_node;
|
|
|
|
|
+ unsigned int led_polarity;
|
2013-07-29 13:09:16 +00:00
|
|
|
+
|
2013-08-05 09:09:41 +00:00
|
|
|
+ /* Allow overriding polarity from OF */
|
|
|
|
|
+ if (!of_property_read_u32(np, "ralink,led-polarity",
|
|
|
|
|
+ &led_polarity))
|
|
|
|
|
+ rt2x00_set_field16(&eeprom, EEPROM_FREQ_LED_POLARITY,
|
|
|
|
|
+ led_polarity);
|
|
|
|
|
+ }
|
2013-07-29 13:09:16 +00:00
|
|
|
+
|
|
|
|
|
rt2x00dev->led_mcu_reg = eeprom;
|
|
|
|
|
#endif /* CPTCFG_RT2X00_LIB_LEDS */
|
|
|
|
|
|
2015-12-04 22:39:37 +00:00
|
|
|
--- a/drivers/net/wireless/ralink/rt2x00/rt2x00leds.c
|
|
|
|
|
+++ b/drivers/net/wireless/ralink/rt2x00/rt2x00leds.c
|
2019-07-06 22:08:20 +00:00
|
|
|
@@ -98,6 +98,9 @@ static int rt2x00leds_register_led(struc
|
2013-07-29 13:09:16 +00:00
|
|
|
led->led_dev.name = name;
|
|
|
|
|
led->led_dev.brightness = LED_OFF;
|
|
|
|
|
|
2013-08-05 09:09:41 +00:00
|
|
|
+ if (rt2x00_is_soc(rt2x00dev))
|
|
|
|
|
+ led->led_dev.brightness_set(&led->led_dev, LED_OFF);
|
|
|
|
|
+
|
2013-07-29 13:09:16 +00:00
|
|
|
retval = led_classdev_register(device, &led->led_dev);
|
|
|
|
|
if (retval) {
|
2013-08-05 09:09:41 +00:00
|
|
|
rt2x00_err(rt2x00dev, "Failed to register led handler\n");
|
