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

[linux-2.6-block.git] / drivers / leds / Kconfig

diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
index 4191614c4651eaef0e3d58dffa2008e737ad877b..9ad35f72ab4c077791cf7942cceb36301325872d 100644 (file)
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@ -39,6 +39,32 @@ config LEDS_88PM860X
          This option enables support for on-chip LED drivers found on Marvell
          Semiconductor 88PM8606 PMIC.
 
+config LEDS_AAT1290
+       tristate "LED support for the AAT1290"
+       depends on LEDS_CLASS_FLASH
+       depends on V4L2_FLASH_LED_CLASS || !V4L2_FLASH_LED_CLASS
+       depends on GPIOLIB
+       depends on OF
+       depends on PINCTRL
+       help
+        This option enables support for the LEDs on the AAT1290.
+
+config LEDS_BCM6328
+       tristate "LED Support for Broadcom BCM6328"
+       depends on LEDS_CLASS
+       depends on OF
+       help
+         This option enables support for LEDs connected to the BCM6328
+         LED HW controller accessed via MMIO registers.
+
+config LEDS_BCM6358
+       tristate "LED Support for Broadcom BCM6358"
+       depends on LEDS_CLASS
+       depends on OF
+       help
+         This option enables support for LEDs connected to the BCM6358
+         LED HW controller accessed via MMIO registers.
+
 config LEDS_LM3530
        tristate "LCD Backlight driver for LM3530"
        depends on LEDS_CLASS
@@ -179,7 +205,7 @@ config LEDS_PCA9532_GPIO
 config LEDS_GPIO
        tristate "LED Support for GPIO connected LEDs"
        depends on LEDS_CLASS
-       depends on GPIOLIB
+       depends on GPIOLIB || COMPILE_TEST
        help
          This option enables support for the LEDs connected to GPIO
          outputs. To be useful the particular board must have LEDs
@@ -203,6 +229,7 @@ config LEDS_LP55XX_COMMON
        tristate "Common Driver for TI/National LP5521/5523/55231/5562/8501"
        depends on LEDS_LP5521 || LEDS_LP5523 || LEDS_LP5562 || LEDS_LP8501
        select FW_LOADER
+       select FW_LOADER_USER_HELPER_FALLBACK
        help
          This option supports common operations for LP5521/5523/55231/5562/8501
          devices.
@@ -464,6 +491,25 @@ config LEDS_TCA6507
          LED driver chips accessed via the I2C bus.
          Driver support brightness control and hardware-assisted blinking.
 
+config LEDS_TLC591XX
+       tristate "LED driver for TLC59108 and TLC59116 controllers"
+       depends on LEDS_CLASS && I2C
+       select REGMAP_I2C
+       help
+         This option enables support for Texas Instruments TLC59108
+         and TLC59116 LED controllers.
+
+config LEDS_MAX77693
+       tristate "LED support for MAX77693 Flash"
+       depends on LEDS_CLASS_FLASH
+       depends on V4L2_FLASH_LED_CLASS || !V4L2_FLASH_LED_CLASS
+       depends on MFD_MAX77693
+       depends on OF
+       help
+         This option enables support for the flash part of the MAX77693
+         multifunction device. It has build in control for two leds in flash
+         and torch mode.
+
 config LEDS_MAX8997
        tristate "LED support for MAX8997 PMIC"
        depends on LEDS_CLASS && MFD_MAX8997
@@ -495,6 +541,15 @@ config LEDS_MENF21BMC
          This driver can also be built as a module. If so the module
          will be called leds-menf21bmc.
 
+config LEDS_KTD2692
+       tristate "LED support for KTD2692 flash LED controller"
+       depends on LEDS_CLASS_FLASH && GPIOLIB && OF
+       help
+         This option enables support for KTD2692 LED flash connected
+         through ExpressWire interface.
+
+         Say Y to enable this driver.
+
 comment "LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM)"
 
 config LEDS_BLINKM