Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

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

diff --git a/drivers/video/backlight/Kconfig b/drivers/video/backlight/Kconfig
index 2580f5fa2486e4caefbed82b3bbd357901926151..924e2551044aee6b1f3e84b547c702ac30690412 100644 (file)
--- a/drivers/video/backlight/Kconfig
+++ b/drivers/video/backlight/Kconfig
@@ -24,6 +24,18 @@ config LCD_CLASS_DEVICE
          To have support for your specific LCD panel you will have to
          select the proper drivers which depend on this option.
 
+config LCD_LTV350QV
+       tristate "Samsung LTV350QV LCD Panel"
+       depends on LCD_CLASS_DEVICE && SPI_MASTER
+       default n
+       help
+         If you have a Samsung LTV350QV LCD panel, say y to include a
+         power control driver for it.  The panel starts up in power
+         off state, so you need this driver in order to see any
+         output.
+
+         The LTV350QV panel is present on all ATSTK1000 boards.
+
 #
 # Backlight
 #
@@ -38,13 +50,27 @@ config BACKLIGHT_CLASS_DEVICE
          To have support for your specific LCD panel you will have to
          select the proper drivers which depend on this option.
 
+config BACKLIGHT_ATMEL_LCDC
+       bool "Atmel LCDC Contrast-as-Backlight control"
+       depends on BACKLIGHT_CLASS_DEVICE && FB_ATMEL
+       default y if MACH_SAM9261EK || MACH_SAM9263EK
+       help
+         This provides a backlight control internal to the Atmel LCDC
+         driver.  If the LCD "contrast control" on your board is wired
+         so it controls the backlight brightness, select this option to
+         export this as a PWM-based backlight control.
+
+         If in doubt, it's safe to enable this option; it doesn't kick
+         in unless the board's description says it's wired that way.
+
 config BACKLIGHT_CORGI
-       tristate "Sharp Corgi Backlight Driver (SL Series)"
-       depends on BACKLIGHT_CLASS_DEVICE && PXA_SHARPSL
-       default y
+       tristate "Generic (aka Sharp Corgi) Backlight Driver"
+       depends on BACKLIGHT_CLASS_DEVICE
+       default n
        help
-         If you have a Sharp Zaurus SL-C7xx, SL-Cxx00 or SL-6000x say y to enable the
-         backlight driver.
+         Say y to enable the generic platform backlight driver previously
+         known as the Corgi backlight driver. If you have a Sharp Zaurus
+         SL-C7xx, SL-Cxx00 or SL-6000x say y. Most users can say n.
 
 config BACKLIGHT_LOCOMO
        tristate "Sharp LOCOMO LCD/Backlight Driver"