Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / leds / Kconfig

diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
index ec568fa1c6cc3b2ec92e6314de868416bb1e2ded..e2235fe564b5453bc491a6b80937349a7b227aa5 100644 (file)
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@ -1,6 +1,5 @@
 menuconfig NEW_LEDS
        bool "LED Support"
-       depends on HAS_IOMEM
        help
          Say Y to enable Linux LED support.  This allows control of supported
          LEDs from both userspace and optionally, by kernel events (triggers).
@@ -18,6 +17,13 @@ config LEDS_CLASS
 
 comment "LED drivers"
 
+config LEDS_ATMEL_PWM
+       tristate "LED Support using Atmel PWM outputs"
+       depends on LEDS_CLASS && ATMEL_PWM
+       help
+         This option enables support for LEDs driven using outputs
+         of the dedicated PWM controller found on newer Atmel SOCs.
+
 config LEDS_CORGI
        tristate "LED Support for the Sharp SL-C7x0 series"
        depends on LEDS_CLASS && PXA_SHARP_C7xx
@@ -39,22 +45,6 @@ config LEDS_SPITZ
          This option enables support for the LEDs on Sharp Zaurus
          SL-Cxx00 series (C1000, C3000, C3100).
 
-config LEDS_IXP4XX
-       tristate "LED Support for GPIO connected LEDs on IXP4XX processors"
-       depends on LEDS_CLASS && ARCH_IXP4XX
-       help
-         This option enables support for the LEDs connected to GPIO
-         outputs of the Intel IXP4XX processors.  To be useful the
-         particular board must have LEDs and they must be connected
-         to the GPIO lines.  If unsure, say Y.
-
-config LEDS_TOSA
-       tristate "LED Support for the Sharp SL-6000 series"
-       depends on LEDS_CLASS && PXA_SHARPSL
-       help
-         This option enables support for the LEDs on Sharp Zaurus
-         SL-6000 series.
-
 config LEDS_S3C24XX
        tristate "LED Support for Samsung S3C24XX GPIO LEDs"
        depends on LEDS_CLASS && ARCH_S3C2410
@@ -81,6 +71,27 @@ config LEDS_WRAP
        help
          This option enables support for the PCEngines WRAP programmable LEDs.
 
+config LEDS_OMAP_DEBUG
+       boolean "LED Support for OMAP debug board LEDs"
+       depends on LEDS_CLASS=y && ARCH_OMAP
+       help
+         Enables support for the LEDs on the debug board used with OMAP
+         reference boards like H2/H3/H4 and Perseus2.  Up to six of these
+         may be claimed by the original ARM debug LED API.
+
+config LEDS_OMAP
+       tristate "LED Support for OMAP GPIO LEDs"
+       depends on LEDS_CLASS && ARCH_OMAP
+       help
+         This option enables support for the LEDs on OMAP processors.
+
+config LEDS_OMAP_PWM
+       tristate "LED Support for OMAP PWM-controlled LEDs"
+       depends on LEDS_CLASS && ARCH_OMAP && OMAP_DM_TIMER
+       help
+         This options enables support for LEDs connected to GPIO lines
+         controlled by a PWM timer on OMAP CPUs.
+
 config LEDS_H1940
        tristate "LED Support for iPAQ H1940 device"
        depends on LEDS_CLASS && ARCH_H1940
@@ -100,6 +111,13 @@ config LEDS_COBALT_RAQ
        help
          This option enables support for the Cobalt Raq series LEDs.
 
+config LEDS_HP6XX
+       tristate "LED Support for the HP Jornada 6xx"
+       depends on LEDS_CLASS && SH_HP6XX
+       help
+         This option enables led support for the handheld
+         HP Jornada 620/660/680/690.
+
 config LEDS_GPIO
        tristate "LED Support for GPIO connected LEDs"
        depends on LEDS_CLASS && GENERIC_GPIO
@@ -114,6 +132,32 @@ config LEDS_CM_X270
        help
          This option enables support for the CM-X270 LEDs.
 
+config LEDS_CLEVO_MAIL
+       tristate "Mail LED on Clevo notebook (EXPERIMENTAL)"
+       depends on LEDS_CLASS && X86 && SERIO_I8042 && DMI && EXPERIMENTAL
+       help
+         This driver makes the mail LED accessible from userspace
+         programs through the leds subsystem. This LED have three
+         known mode: off, blink at 0.5Hz and blink at 1Hz.
+
+         The driver supports two kinds of interface: using ledtrig-timer
+         or through /sys/class/leds/clevo::mail/brightness. As this LED
+         cannot change it's brightness it blinks instead. The brightness
+         value 0 means off, 1..127 means blink at 0.5Hz and 128..255 means
+         blink at 1Hz.
+
+         This module can drive the mail LED for the following notebooks:
+
+               Clevo D410J
+               Clevo D410V
+               Clevo D400V/D470V (not tested, but might work)
+               Clevo M540N
+               Clevo M5x0N (not tested, but might work)
+               Positivo Mobile (Clevo M5x0V)
+
+         To compile this driver as a module, choose M here: the
+         module will be called leds-clevo-mail.
+
 comment "LED Triggers"
 
 config LEDS_TRIGGERS
@@ -128,7 +172,11 @@ config LEDS_TRIGGER_TIMER
        depends on LEDS_TRIGGERS
        help
          This allows LEDs to be controlled by a programmable timer
-         via sysfs. If unsure, say Y.
+         via sysfs. Some LED hardware can be programmed to start
+         blinking the LED without any further software interaction.
+         For more details read Documentation/leds-class.txt.
+
+         If unsure, say Y.
 
 config LEDS_TRIGGER_IDE_DISK
        bool "LED IDE Disk Trigger"