Merge current mainline tree into linux-omap tree

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

diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index 1542e160ad45b43c49bfc860acda4d772b580674..8b5fd6423897ad032e3d0a0376909c9760645774 100644 (file)
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -170,21 +170,6 @@ config TOUCHSCREEN_TOUCHWIN
          To compile this driver as a module, choose M here: the
          module will be called touchwin.
 
-config TOUCHSCREEN_UCB1400
-       tristate "Philips UCB1400 touchscreen"
-       select AC97_BUS
-       help
-         This enables support for the Philips UCB1400 touchscreen interface.
-         The UCB1400 is an AC97 audio codec.  The touchscreen interface
-         will be initialized only after the ALSA subsystem has been
-         brought up and the UCB1400 detected.  You therefore have to
-         configure ALSA support as well (either built-in or modular,
-         independently of whether this driver is itself built-in or
-         modular) for this driver to work.
-
-         To compile this driver as a module, choose M here: the
-         module will be called ucb1400_ts.
-
 config TOUCHSCREEN_TSC2005
        tristate "TSC2005 touchscreen support"
        help
@@ -225,6 +210,74 @@ config TOUCHSCREEN_TSC2301
        help
          Say Y here for if you are using the touchscreen features of TSC2301.
 
+config TOUCHSCREEN_UCB1400
+       tristate "Philips UCB1400 touchscreen"
+       select AC97_BUS
+       help
+         This enables support for the Philips UCB1400 touchscreen interface.
+         The UCB1400 is an AC97 audio codec.  The touchscreen interface
+         will be initialized only after the ALSA subsystem has been
+         brought up and the UCB1400 detected.  You therefore have to
+         configure ALSA support as well (either built-in or modular,
+         independently of whether this driver is itself built-in or
+         modular) for this driver to work.
+
+         To compile this driver as a module, choose M here: the
+         module will be called ucb1400_ts.
+
+config TOUCHSCREEN_WM97XX
+       tristate "Support for WM97xx AC97 touchscreen controllers"
+       depends on AC97_BUS
+       help
+         Say Y here if you have a Wolfson Microelectronics WM97xx
+         touchscreen connected to your system. Note that this option
+         only enables core driver, you will also need to select
+         support for appropriate chip below.
+
+         If unsure, say N.
+
+         To compile this driver as a module, choose M here: the
+         module will be called wm97xx-ts.
+
+config TOUCHSCREEN_WM9705
+       bool "WM9705 Touchscreen interface support"
+       depends on TOUCHSCREEN_WM97XX
+       help
+         Say Y here if you have a Wolfson Microelectronics WM9705
+         touchscreen controller connected to your system.
+
+         If unsure, say N.
+
+config TOUCHSCREEN_WM9712
+       bool "WM9712 Touchscreen interface support"
+       depends on TOUCHSCREEN_WM97XX
+       help
+         Say Y here if you have a Wolfson Microelectronics WM9712
+         touchscreen controller connected to your system.
+
+         If unsure, say N.
+
+config TOUCHSCREEN_WM9713
+       bool "WM9713 Touchscreen interface support"
+       depends on TOUCHSCREEN_WM97XX
+       help
+         Say Y here if you have a Wolfson Microelectronics WM9713 touchscreen
+         controller connected to your system.
+
+         If unsure, say N.
+
+config TOUCHSCREEN_WM97XX_MAINSTONE
+       tristate "WM97xx Mainstone accelerated touch"
+       depends on TOUCHSCREEN_WM97XX && ARCH_PXA
+       help
+         Say Y here for support for streaming mode with WM97xx touchscreens
+         on Mainstone systems.
+
+         If unsure, say N.
+
+         To compile this driver as a module, choose M here: the
+         module will be called mainstone-wm97xx.
+
 config TOUCHSCREEN_USB_COMPOSITE
        tristate "USB Touchscreen Driver"
        depends on USB_ARCH_HAS_HCD