Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds

* 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds:
  leds: Add mx31moboard MC13783 led support
  leds: Add mc13783 LED support
  leds: leds-ss4200: fix led_classdev_unregister twice in error handling
  leds: leds-lp3944: properly handle lp3944_configure fail in lp3944_probe
  leds: led-class: set permissions on max_brightness file to 0444
  leds: leds-gpio: Change blink_set callback to be able to turn off blinking
  leds: Add LED driver for the Soekris net5501 board
  leds: 88pm860x - fix checking in probe function

2 files changed, 56 insertions, 11 deletions

diff --git a/arch/arm/mach-mx3/mach-mx31moboard.c b/arch/arm/mach-mx3/mach-mx31moboard.c
index 33a8d35498a..62b5e40165d 100644
--- a/arch/arm/mach-mx3/mach-mx31moboard.c
+++ b/arch/arm/mach-mx3/mach-mx31moboard.c
@@ -220,11 +220,54 @@ static struct mc13783_regulator_init_data moboard_regulators[] = {
         },
 };
 
+static struct mc13783_led_platform_data moboard_led[] = {
+        {
+                .id = MC13783_LED_R1,
+                .name = "coreboard-led-4:red",
+                .max_current = 2,
+        },
+        {
+                .id = MC13783_LED_G1,
+                .name = "coreboard-led-4:green",
+                .max_current = 2,
+        },
+        {
+                .id = MC13783_LED_B1,
+                .name = "coreboard-led-4:blue",
+                .max_current = 2,
+        },
+        {
+                .id = MC13783_LED_R2,
+                .name = "coreboard-led-5:red",
+                .max_current = 3,
+        },
+        {
+                .id = MC13783_LED_G2,
+                .name = "coreboard-led-5:green",
+                .max_current = 3,
+        },
+        {
+                .id = MC13783_LED_B2,
+                .name = "coreboard-led-5:blue",
+                .max_current = 3,
+        },
+};
+
+static struct mc13783_leds_platform_data moboard_leds = {
+        .num_leds = ARRAY_SIZE(moboard_led),
+        .led = moboard_led,
+        .flags = MC13783_LED_SLEWLIMTC,
+        .abmode = MC13783_LED_AB_DISABLED,
+        .tc1_period = MC13783_LED_PERIOD_10MS,
+        .tc2_period = MC13783_LED_PERIOD_10MS,
+};
+
 static struct mc13783_platform_data moboard_pmic = {
         .regulators = moboard_regulators,
         .num_regulators = ARRAY_SIZE(moboard_regulators),
+        .leds = &moboard_leds,
         .flags = MC13783_USE_REGULATOR | MC13783_USE_RTC |
-                MC13783_USE_ADC,
+                MC13783_USE_ADC | MC13783_USE_LED,
 };
 
 static struct spi_board_info moboard_spi_board_info[] __initdata = {
diff --git a/arch/arm/mach-orion5x/dns323-setup.c b/arch/arm/mach-orion5x/dns323-setup.c
index 685f34a9634..fe0de1698ed 100644
--- a/arch/arm/mach-orion5x/dns323-setup.c
+++ b/arch/arm/mach-orion5x/dns323-setup.c
@@ -240,22 +240,23 @@ error_fail:
 
 #define ORION_BLINK_HALF_PERIOD 100 /* ms */
 
-static int dns323_gpio_blink_set(unsigned gpio,
+static int dns323_gpio_blink_set(unsigned gpio, int state,
         unsigned long *delay_on, unsigned long *delay_off)
 {
-        static int value = 0;
 
-        if (!*delay_on && !*delay_off)
+        if (delay_on && delay_off && !*delay_on && !*delay_off)
                 *delay_on = *delay_off = ORION_BLINK_HALF_PERIOD;
 
-        if (ORION_BLINK_HALF_PERIOD == *delay_on
-            && ORION_BLINK_HALF_PERIOD == *delay_off) {
-                value = !value;
-                orion_gpio_set_blink(gpio, value);
-                return 0;
+        switch(state) {
+        case GPIO_LED_NO_BLINK_LOW:
+        case GPIO_LED_NO_BLINK_HIGH:
+                orion_gpio_set_blink(gpio, 0);
+                gpio_set_value(gpio, state);
+                break;
+        case GPIO_LED_BLINK:
+                orion_gpio_set_blink(gpio, 1);
         }
-
-        return -EINVAL;
+        return 0;
 }
 
 static struct gpio_led dns323_leds[] = {
@@ -263,6 +264,7 @@ static struct gpio_led dns323_leds[] = {
                 .name = "power:blue",
                 .gpio = DNS323_GPIO_LED_POWER2,
                 .default_trigger = "timer",
+                .active_low = 1,
         }, {
                 .name = "right:amber",
                 .gpio = DNS323_GPIO_LED_RIGHT_AMBER,