Merge tag 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik...

[cascardo/linux.git] / drivers / input / touchscreen / Kconfig

diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index 4af2a18..2a21419 100644 (file)
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -139,7 +139,6 @@ config TOUCHSCREEN_CY8CTMG110
        tristate "cy8ctmg110 touchscreen"
        depends on I2C
        depends on GPIOLIB
-
        help
          Say Y here if you have a cy8ctmg110 capacitive touchscreen on
          an AAVA device.
@@ -149,6 +148,37 @@ config TOUCHSCREEN_CY8CTMG110
          To compile this driver as a module, choose M here: the
          module will be called cy8ctmg110_ts.
 
+config TOUCHSCREEN_CYTTSP_CORE
+       tristate "Cypress TTSP touchscreen"
+       help
+         Say Y here if you have a touchscreen using controller from
+         the Cypress TrueTouch(tm) Standard Product family connected
+         to your system. You will also need to select appropriate
+         bus connection below.
+
+         If unsure, say N.
+
+         To compile this driver as a module, choose M here: the
+         module will be called cyttsp_core.
+
+config TOUCHSCREEN_CYTTSP_I2C
+       tristate "support I2C bus connection"
+       depends on TOUCHSCREEN_CYTTSP_CORE && I2C
+       help
+         Say Y here if the touchscreen is connected via I2C bus.
+
+         To compile this driver as a module, choose M here: the
+         module will be called cyttsp_i2c.
+
+config TOUCHSCREEN_CYTTSP_SPI
+       tristate "support SPI bus connection"
+       depends on TOUCHSCREEN_CYTTSP_CORE && SPI_MASTER
+       help
+         Say Y here if the touchscreen is connected via SPI bus.
+
+         To compile this driver as a module, choose M here: the
+         module will be called cyttsp_spi.
+
 config TOUCHSCREEN_DA9034
        tristate "Touchscreen support for Dialog Semiconductor DA9034"
        depends on PMIC_DA903X
@@ -213,9 +243,24 @@ config TOUCHSCREEN_FUJITSU
          To compile this driver as a module, choose M here: the
          module will be called fujitsu-ts.
 
+config TOUCHSCREEN_ILI210X
+       tristate "Ilitek ILI210X based touchscreen"
+       depends on I2C
+       help
+         Say Y here if you have a ILI210X based touchscreen
+         controller. This driver supports models ILI2102,
+         ILI2102s, ILI2103, ILI2103s and ILI2105.
+         Such kind of chipsets can be found in Amazon Kindle Fire
+         touchscreens.
+
+         If unsure, say N.
+
+         To compile this driver as a module, choose M here: the
+         module will be called ili210x.
+
 config TOUCHSCREEN_S3C2410
        tristate "Samsung S3C2410/generic touchscreen input driver"
-       depends on ARCH_S3C2410 || SAMSUNG_DEV_TS
+       depends on ARCH_S3C24XX || SAMSUNG_DEV_TS
        select S3C_ADC
        help
          Say Y here if you have the s3c2410 touchscreen.
@@ -430,6 +475,18 @@ config TOUCHSCREEN_TOUCHWIN
          To compile this driver as a module, choose M here: the
          module will be called touchwin.
 
+config TOUCHSCREEN_TI_TSCADC
+       tristate "TI Touchscreen Interface"
+       depends on ARCH_OMAP2PLUS
+       help
+         Say Y here if you have 4/5/8 wire touchscreen controller
+         to be connected to the ADC controller on your TI AM335x SoC.
+
+         If unsure, say N.
+
+         To compile this driver as a module, choose M here: the
+         module will be called ti_tscadc.
+
 config TOUCHSCREEN_ATMEL_TSADCC
        tristate "Atmel Touchscreen Interface"
        depends on ARCH_AT91SAM9RL || ARCH_AT91SAM9G45
@@ -577,6 +634,7 @@ config TOUCHSCREEN_USB_COMPOSITE
          - JASTEC USB Touch Controller/DigiTech DTR-02U
          - Zytronic controllers
          - Elo TouchSystems 2700 IntelliTouch
+         - EasyTouch USB Touch Controller from Data Modul
 
          Have a look at <http://linux.chapter7.ch/touchkit/> for
          a usage description and the required user-space stuff.
@@ -681,6 +739,14 @@ config TOUCHSCREEN_USB_NEXIO
        bool "NEXIO/iNexio device support" if EXPERT
        depends on TOUCHSCREEN_USB_COMPOSITE
 
+config TOUCHSCREEN_USB_EASYTOUCH
+       default y
+       bool "EasyTouch USB Touch controller device support" if EMBEDDED
+       depends on TOUCHSCREEN_USB_COMPOSITE
+       help
+         Say Y here if you have a EasyTouch USB Touch controller device support.
+         If unsure, say N.
+
 config TOUCHSCREEN_TOUCHIT213
        tristate "Sahara TouchIT-213 touchscreen"
        select SERIO