rt2x00: merge an rt2800 initialization order fix
[openwrt/openwrt.git] / package / kernel / mac80211 / patches / 619-rt2x00-change-led-polarity-from-OF.patch
index bf0572e..a81d6c9 100644 (file)
@@ -8,27 +8,33 @@
  
  #include "rt2x00.h"
  #include "rt2800lib.h"
-@@ -5966,6 +5967,13 @@ static int rt2800_init_eeprom(struct rt2
+@@ -7253,6 +7254,17 @@ static int rt2800_init_eeprom(struct rt2
        rt2800_init_led(rt2x00dev, &rt2x00dev->led_assoc, LED_TYPE_ASSOC);
        rt2800_init_led(rt2x00dev, &rt2x00dev->led_qual, LED_TYPE_QUALITY);
  
-+      /* Allow overriding polarity from OF */
-+      struct device_node *np = rt2x00dev->dev->of_node;
-+      unsigned int led_polarity;
++      {
++              struct device_node *np = rt2x00dev->dev->of_node;
++              unsigned int led_polarity;
 +
-+      if (!of_property_read_u32(np, "ralink,led-polarity", &led_polarity))
-+              rt2x00_set_field16(&eeprom, EEPROM_FREQ_LED_POLARITY, led_polarity);
++              /* 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);
++      }
 +
        rt2x00dev->led_mcu_reg = eeprom;
  #endif /* CPTCFG_RT2X00_LIB_LEDS */
  
 --- a/drivers/net/wireless/rt2x00/rt2x00leds.c
 +++ b/drivers/net/wireless/rt2x00/rt2x00leds.c
-@@ -110,6 +110,7 @@ static int rt2x00leds_register_led(struc
+@@ -111,6 +111,9 @@ static int rt2x00leds_register_led(struc
        led->led_dev.name = name;
        led->led_dev.brightness = LED_OFF;
-+      led->led_dev.brightness_set(&led->led_dev, LED_OFF);
  
++      if (rt2x00_is_soc(rt2x00dev))
++              led->led_dev.brightness_set(&led->led_dev, LED_OFF);
++
        retval = led_classdev_register(device, &led->led_dev);
        if (retval) {
+               rt2x00_err(rt2x00dev, "Failed to register led handler\n");