Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds

Pull LED subsystem update from Bryan Wu:
 "Basically this cycle is mostly cleanup for LED subsystem"

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds:
  leds: s3c24xx: Remove hardware.h inclusion
  leds: replace list_for_each with list_for_each_entry
  leds: kirkwood: Cleanup in header files
  leds: pwm: Remove a warning on non-DT platforms
  leds: leds-pwm: fix duty time overflow.
  leds: leds-mc13783: Remove unneeded mc13xxx_{un}lock
  leds: leds-mc13783: Remove duplicate field in platform data
  drivers: leds: leds-tca6507: check CONFIG_GPIOLIB whether defined for 'gpio_base'
  leds: lp5523: Support LED MUX configuration on running a pattern
  leds: lp5521/5523: Fix multiple engine usage bug
  LEDS: tca6507 - fix up some comments.
  LEDS: tca6507: add device-tree support for GPIO configuration.
  LEDS: tca6507 - fix bugs in parsing of device-tree configuration.

1 files changed, 8 insertions, 8 deletions

diff --git a/arch/arm/mach-imx/mach-mx31moboard.c b/arch/arm/mach-imx/mach-mx31moboard.c
index 6f424eced181..b3738e616f19 100644
--- a/arch/arm/mach-imx/mach-mx31moboard.c
+++ b/arch/arm/mach-imx/mach-mx31moboard.c
@@ -236,32 +236,26 @@ static struct mc13xxx_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,
         },
 };
 
@@ -271,8 +265,14 @@ static struct mc13xxx_leds_platform_data moboard_leds = {
         .led_control[0] = MC13783_LED_C0_ENABLE | MC13783_LED_C0_ABMODE(0),
         .led_control[1] = MC13783_LED_C1_SLEWLIM,
         .led_control[2] = MC13783_LED_C2_SLEWLIM,
-        .led_control[3] = MC13783_LED_C3_PERIOD(0),
-        .led_control[4] = MC13783_LED_C3_PERIOD(0),
+        .led_control[3] = MC13783_LED_C3_PERIOD(0) |
+                          MC13783_LED_C3_CURRENT_R1(2) |
+                          MC13783_LED_C3_CURRENT_G1(2) |
+                          MC13783_LED_C3_CURRENT_B1(2),
+        .led_control[4] = MC13783_LED_C4_PERIOD(0) |
+                          MC13783_LED_C4_CURRENT_R2(3) |
+                          MC13783_LED_C4_CURRENT_G2(3) |
+                          MC13783_LED_C4_CURRENT_B2(3),
 };
 
 static struct mc13xxx_buttons_platform_data moboard_buttons = {