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

Pull led updates from Bryan Wu:
 "Sorry for the late pull request, since I'm just back from vacation.

  LED subsystem updates for 3.12:
   - pca9633 driver DT supporting and pca9634 chip supporting
   - restore legacy device attributes for lp5521
   - other fixing and updates"

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds: (28 commits)
  leds: wm831x-status: Request a REG resource
  leds: trigger: ledtrig-backlight: Fix invalid memory access in fb_event notification callback
  leds-pca963x: Fix device tree parsing
  leds-pca9633: Rename to leds-pca963x
  leds-pca9633: Add mutex to the ledout register
  leds-pca9633: Unique naming of the LEDs
  leds-pca9633: Add support for PCA9634
  leds: lp5562: use LP55xx common macros for device attributes
  Documentation: leds-lp5521,lp5523: update device attribute information
  leds: lp5523: remove unnecessary writing commands
  leds: lp5523: restore legacy device attributes
  leds: lp5523: LED MUX configuration on initializing
  leds: lp5523: make separate API for loading engine
  leds: lp5521: remove unnecessary writing commands
  leds: lp5521: restore legacy device attributes
  leds: lp55xx: add common macros for device attributes
  leds: lp55xx: add common data structure for program
  Documentation: leds: Fix a typo
  leds: ss4200: Fix incorrect placement of __initdata
  leds: clevo-mail: Fix incorrect placement of __initdata
  ...

diff --combined drivers/leds/Kconfig
index 074bcb3892b56ad92aea059694b5f3d4ef89bea2,a1a52bec03d431a2e81f4db95f05d464856e1827..875bbe4c962ea4a0229b073edab2e1c301575055
--- 1/drivers/leds/Kconfig
--- 2/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@@ -194,11 -194,11 +194,11 @@@ config LEDS_LP394
          module will be called leds-lp3944.
  
  config LEDS_LP55XX_COMMON
-       tristate "Common Driver for TI/National LP5521, LP5523/55231 and LP5562"
-       depends on LEDS_LP5521 || LEDS_LP5523 || LEDS_LP5562
+       tristate "Common Driver for TI/National LP5521/5523/55231/5562/8501"
+       depends on LEDS_LP5521 || LEDS_LP5523 || LEDS_LP5562 || LEDS_LP8501
        select FW_LOADER
        help
-         This option supports common operations for LP5521 and LP5523/55231
+         This option supports common operations for LP5521/5523/55231/5562/8501
          devices.
  
  config LEDS_LP5521
@@@ -232,6 -232,18 +232,18 @@@ config LEDS_LP556
          Driver provides direct control via LED class and interface for
          programming the engines.
  
+ config LEDS_LP8501
+       tristate "LED Support for TI LP8501 LED driver chip"
+       depends on LEDS_CLASS && I2C
+       select LEDS_LP55XX_COMMON
+       help
+         If you say yes here you get support for TI LP8501 LED driver.
+         It is 9 channel chip with programmable engines.
+         Driver provides direct control via LED class and interface for
+         programming the engines.
+         It is similar as LP5523, but output power selection is available.
+         And register layout and engine program schemes are different.
+ 
  config LEDS_LP8788
        tristate "LED support for the TI LP8788 PMIC"
        depends on LEDS_CLASS
@@@ -279,13 -291,14 +291,14 @@@ config LEDS_PCA955
          LED driver chips accessed via the I2C bus.  Supported
          devices include PCA9550, PCA9551, PCA9552, and PCA9553.
  
- config LEDS_PCA9633
-       tristate "LED support for PCA9633 I2C chip"
+ config LEDS_PCA963X
+       tristate "LED support for PCA963x I2C chip"
        depends on LEDS_CLASS
        depends on I2C
        help
-         This option enables support for LEDs connected to the PCA9633
-         LED driver chip accessed via the I2C bus.
+         This option enables support for LEDs connected to the PCA963x
+         LED driver chip accessed via the I2C bus. Supported
+         devices include PCA9633 and PCA9634
  
  config LEDS_WM831X_STATUS
        tristate "LED support for status LEDs on WM831x PMICs"
@@@ -398,10 -411,7 +411,7 @@@ config LEDS_MC1378
  config LEDS_NS2
        tristate "LED support for Network Space v2 GPIO LEDs"
        depends on LEDS_CLASS
-       depends on MACH_NETSPACE_V2 || MACH_INETSPACE_V2 || \
-                  MACH_NETSPACE_MAX_V2 || MACH_D2NET_V2 || \
-                  MACH_NETSPACE_V2_DT || MACH_INETSPACE_V2_DT || \
-                  MACH_NETSPACE_MAX_V2_DT || MACH_NETSPACE_MINI_V2_DT
+       depends on ARCH_KIRKWOOD
        default y
        help
          This option enable support for the dual-GPIO LED found on the
@@@ -410,8 -420,8 +420,8 @@@
  
  config LEDS_NETXBIG
        tristate "LED support for Big Network series LEDs"
-       depends on MACH_NET2BIG_V2 || MACH_NET5BIG_V2
        depends on LEDS_CLASS
+       depends on ARCH_KIRKWOOD
        default y
        help
          This option enable support for LEDs found on the LaCie 2Big
@@@ -429,6 -439,18 +439,6 @@@ config LEDS_ASIC
          cannot be used. This driver supports hardware blinking with an on+off
          period from 62ms to 125s. Say Y to enable LEDs on the HP iPAQ hx4700.
  
 -config LEDS_RENESAS_TPU
 -      bool "LED support for Renesas TPU"
 -      depends on LEDS_CLASS=y && HAVE_CLK && GPIOLIB
 -      help
 -        This option enables build of the LED TPU platform driver,
 -        suitable to drive any TPU channel on newer Renesas SoCs.
 -        The driver controls the GPIO pin connected to the LED via
 -        the GPIO framework and expects the LED to be connected to
 -        a pin that can be driven in both GPIO mode and using TPU
 -        pin function. The latter to support brightness control.
 -        Brightness control is supported but hardware blinking is not.
 -
  config LEDS_TCA6507
        tristate "LED Support for TCA6507 I2C chip"
        depends on LEDS_CLASS && I2C

diff --combined drivers/leds/Makefile
index ae4b6135f66513fb7f3eefc90ad6d261ab2ca2a6,c7e35423fed9bb33aeb7b55901532e0baa93529c..8979b0b2c85ed03e37ab880e14823f17f66922ed
--- 1/drivers/leds/Makefile
--- 2/drivers/leds/Makefile
+++ b/drivers/leds/Makefile
@@@ -27,6 -27,7 +27,7 @@@ obj-$(CONFIG_LEDS_LP55XX_COMMON)      += led
  obj-$(CONFIG_LEDS_LP5521)             += leds-lp5521.o
  obj-$(CONFIG_LEDS_LP5523)             += leds-lp5523.o
  obj-$(CONFIG_LEDS_LP5562)             += leds-lp5562.o
+ obj-$(CONFIG_LEDS_LP8501)             += leds-lp8501.o
  obj-$(CONFIG_LEDS_LP8788)             += leds-lp8788.o
  obj-$(CONFIG_LEDS_TCA6507)            += leds-tca6507.o
  obj-$(CONFIG_LEDS_CLEVO_MAIL)         += leds-clevo-mail.o
@@@ -34,7 -35,7 +35,7 @@@ obj-$(CONFIG_LEDS_HP6XX)              += leds-hp6xx
  obj-$(CONFIG_LEDS_OT200)              += leds-ot200.o
  obj-$(CONFIG_LEDS_FSG)                        += leds-fsg.o
  obj-$(CONFIG_LEDS_PCA955X)            += leds-pca955x.o
- obj-$(CONFIG_LEDS_PCA9633)            += leds-pca9633.o
+ obj-$(CONFIG_LEDS_PCA963X)            += leds-pca963x.o
  obj-$(CONFIG_LEDS_DA903X)             += leds-da903x.o
  obj-$(CONFIG_LEDS_DA9052)             += leds-da9052.o
  obj-$(CONFIG_LEDS_WM831X_STATUS)      += leds-wm831x-status.o
@@@ -49,6 -50,7 +50,6 @@@ obj-$(CONFIG_LEDS_MC13783)            += leds-mc1
  obj-$(CONFIG_LEDS_NS2)                        += leds-ns2.o
  obj-$(CONFIG_LEDS_NETXBIG)            += leds-netxbig.o
  obj-$(CONFIG_LEDS_ASIC3)              += leds-asic3.o
 -obj-$(CONFIG_LEDS_RENESAS_TPU)                += leds-renesas-tpu.o
  obj-$(CONFIG_LEDS_MAX8997)            += leds-max8997.o
  obj-$(CONFIG_LEDS_LM355x)             += leds-lm355x.o
  obj-$(CONFIG_LEDS_BLINKM)             += leds-blinkm.o