Merge tag 'v4.8' into next

[karo-tx-linux.git] / drivers / input / touchscreen / Kconfig

diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index ee02dc7422bd1a9c03d9171b83a75e3032144bc5..507981356921b3ecc7b620255eac7be924882c42 100644 (file)
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -305,19 +305,6 @@ config TOUCHSCREEN_EGALAX_SERIAL
          To compile this driver as a module, choose M here: the
          module will be called egalax_ts_serial.
 
-config TOUCHSCREEN_FT6236
-       tristate "FT6236 I2C touchscreen"
-       depends on I2C
-       depends on GPIOLIB || COMPILE_TEST
-       help
-         Say Y here to enable support for the I2C connected FT6x06 and
-         FT6x36 family of capacitive touchscreen drivers.
-
-         If unsure, say N.
-
-         To compile this driver as a module, choose M here: the
-         module will be called ft6236.
-
 config TOUCHSCREEN_FUJITSU
        tristate "Fujitsu serial touchscreen"
        select SERIO
@@ -397,6 +384,18 @@ config TOUCHSCREEN_GUNZE
          To compile this driver as a module, choose M here: the
          module will be called gunze.
 
+config TOUCHSCREEN_EKTF2127
+       tristate "Elan eKTF2127 I2C touchscreen"
+       depends on I2C
+       help
+         Say Y here if you have an Elan eKTF2127 touchscreen
+         connected to your system.
+
+         If unsure, say N.
+
+         To compile this driver as a module, choose M here: the
+         module will be called ektf2127.
+
 config TOUCHSCREEN_ELAN
        tristate "Elan eKTH I2C touchscreen"
        depends on I2C
@@ -1059,6 +1058,31 @@ config TOUCHSCREEN_RM_TS
          To compile this driver as a module, choose M here: the
          module will be called raydium_i2c_ts.
 
+config TOUCHSCREEN_SILEAD
+       tristate "Silead I2C touchscreen"
+       depends on I2C
+       help
+         Say Y here if you have the Silead touchscreen connected to
+         your system.
+
+         If unsure, say N.
+
+         To compile this driver as a module, choose M here: the
+         module will be called silead.
+
+config TOUCHSCREEN_SIS_I2C
+       tristate "SiS 9200 family I2C touchscreen"
+       depends on I2C
+       select CRC_ITU_T
+       depends on GPIOLIB || COMPILE_TEST
+       help
+         This enables support for SiS 9200 family over I2C based touchscreens.
+
+         If unsure, say N.
+
+         To compile this driver as a module, choose M here: the
+         module will be called sis_i2c.
+
 config TOUCHSCREEN_ST1232
        tristate "Sitronix ST1232 touchscreen controllers"
        depends on I2C