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

Pull LED subsystem update from Bryan Wu.

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds: (61 commits)
  leds: leds-sunfire: use dev_err()/pr_err() instead of printk()
  leds: 88pm860x: Add missing of_node_put()
  leds: tca6507: Use of_get_child_count()
  leds: leds-pwm: make it depend on PWM and not HAVE_PWM
  Documentation: leds: update LP55xx family devices
  leds-lp55xx: fix problem on removing LED attributes
  leds-lp5521/5523: add author and copyright description
  leds-lp5521/5523: use new lp55xx common header
  leds-lp55xx: clean up headers
  leds-lp55xx: clean up definitions
  leds-lp55xx: clean up unused data and functions
  leds-lp55xx: clean up _remove()
  leds-lp55xx: add new function for removing device attribtues
  leds-lp55xx: code refactoring on selftest function
  leds-lp55xx: use common device attribute driver function
  leds-lp55xx: support device specific attributes
  leds-lp5523: use generic firmware interface
  leds-lp5521: use generic firmware interface
  leds-lp55xx: support firmware interface
  leds-lp55xx: add new lp55xx_register_sysfs() for the firmware interface
  ...

diff --cc arch/arm/mach-omap2/board-rx51-peripherals.c
index c26d441ca4fb4a2e8c7bef134bbaa66996a4b153,1a2c4db13e3268b79d740b104e4028e45c996bd2..3a077df6b8dfff24d7ccb09478f4ffce291e9b42
--- 1/arch/arm/mach-omap2/board-rx51-peripherals.c
--- 2/arch/arm/mach-omap2/board-rx51-peripherals.c
+++ b/arch/arm/mach-omap2/board-rx51-peripherals.c
@@@ -40,9 -40,9 +40,9 @@@
  #include <sound/tpa6130a2-plat.h>
  #include <media/radio-si4713.h>
  #include <media/si4713.h>
- #include <linux/leds-lp5523.h>
+ #include <linux/platform_data/leds-lp55xx.h>
  
 -#include <../drivers/staging/iio/light/tsl2563.h>
 +#include <linux/platform_data/tsl2563.h>
  #include <linux/lis3lv02d.h>
  
  #if defined(CONFIG_IR_RX51) || defined(CONFIG_IR_RX51_MODULE)
@@@ -160,9 -160,8 +160,9 @@@ static struct tsl2563_platform_data rx5
  #endif
  
  #if defined(CONFIG_LEDS_LP5523) || defined(CONFIG_LEDS_LP5523_MODULE)
- static struct lp5523_led_config rx51_lp5523_led_config[] = {
+ static struct lp55xx_led_config rx51_lp5523_led_config[] = {
        {
 +              .name           = "lp5523:kb1",
                .chan_nr        = 0,
                .led_current    = 50,
        }, {

diff --cc arch/arm/mach-ux500/board-mop500.c
Simple merge

diff --cc drivers/leds/Kconfig
Simple merge