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

Pull LED subsystem update from Bryan Wu.

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds: (24 commits)
  leds: add output driver configuration for pca9633 led driver
  leds: lm3642: Use regmap_update_bits() in lm3642_chip_init()
  leds: Add new LED driver for lm3642 chips
  leds-lp5523: Fix riskiness of the page fault
  leds-lp5523: turn off the LED engines on unloading the driver
  leds-lm3530: Fix smatch warnings
  leds-lm3530: Use devm_regulator_get function
  leds: leds-gpio: adopt pinctrl support
  leds: Add new LED driver for lm355x chips
  leds-lp5523: use the i2c device id rather than fixed name
  leds-lp5523: add new device id for LP55231
  leds-lp5523: support new LP55231 device
  leds: triggers: send uevent when changing triggers
  leds-lp5523: minor code style fixes
  leds-lp5523: change the return type of lp5523_set_mode()
  leds-lp5523: set the brightness to 0 forcely on removing the driver
  leds-lp5523: add channel name in the platform data
  leds: leds-gpio: Use of_get_child_count() helper
  leds: leds-gpio: Use platform_{get,set}_drvdata
  leds: leds-gpio: use of_match_ptr()
  ...

1 files changed, 19 insertions, 7 deletions

diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
index 16578d3b52bb..f508defc0d96 100644
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@ -63,6 +63,17 @@ config LEDS_LM3533
           hardware-accelerated blinking with maximum on and off periods of 9.8
           and 77 seconds respectively.
 
+config LEDS_LM3642
+        tristate "LED support for LM3642 Chip"
+        depends on LEDS_CLASS && I2C
+        select REGMAP_I2C
+        help
+          This option enables support for LEDs connected to LM3642.
+          The LM3642 is a 4MHz fixed-frequency synchronous boost
+          converter plus 1.5A constant current driver for a high-current
+          white LED.
+
+
 config LEDS_LOCOMO
         tristate "LED Support for Locomo device"
         depends on LEDS_CLASS
@@ -192,11 +203,12 @@ config LEDS_LP5521
           programming the engines.
 
 config LEDS_LP5523
-        tristate "LED Support for N.S. LP5523 LED driver chip"
+        tristate "LED Support for TI/National LP5523/55231 LED driver chip"
         depends on LEDS_CLASS && I2C
         help
-          If you say yes here you get support for the National Semiconductor
-          LP5523 LED driver. It is 9 channel chip with programmable engines.
+          If you say yes here you get support for TI/National Semiconductor
+          LP5523/55231 LED driver.
+          It is 9 channel chip with programmable engines.
           Driver provides direct control via LED class and interface for
           programming the engines.
 
@@ -422,13 +434,13 @@ config LEDS_MAX8997
           This option enables support for on-chip LED drivers on
           MAXIM MAX8997 PMIC.
 
-config LEDS_LM3556
-        tristate "LED support for LM3556 Chip"
+config LEDS_LM355x
+        tristate "LED support for LM355x Chips, LM3554 and LM3556"
         depends on LEDS_CLASS && I2C
         select REGMAP_I2C
         help
-          This option enables support for LEDs connected to LM3556.
-          LM3556 includes Torch, Flash and Indicator functions.
+          This option enables support for LEDs connected to LM355x.
+          LM355x includes Torch, Flash and Indicator functions.
 
 config LEDS_OT200
         tristate "LED support for the Bachmann OT200"