1 files changed, 39 insertions, 2 deletions

diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index 6261fd6d7c3c..547f67d65372 100644
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -140,6 +140,19 @@ config TOUCHSCREEN_BU21013
           To compile this driver as a module, choose M here: the
           module will be called bu21013_ts.
 
+config TOUCHSCREEN_CHIPONE_ICN8318
+        tristate "chipone icn8318 touchscreen controller"
+        depends on GPIOLIB
+        depends on I2C
+        depends on OF
+        help
+          Say Y here if you have a ChipOne icn8318 based I2C touchscreen.
+
+          If unsure, say N.
+
+          To compile this driver as a module, choose M here: the
+          module will be called chipone_icn8318.
+
 config TOUCHSCREEN_CY8CTMG110
         tristate "cy8ctmg110 touchscreen"
         depends on I2C
@@ -297,11 +310,12 @@ config TOUCHSCREEN_FUJITSU
 
 config TOUCHSCREEN_GOODIX
         tristate "Goodix I2C touchscreen"
-        depends on I2C && ACPI
+        depends on I2C
         help
           Say Y here if you have the Goodix touchscreen (such as one
           installed in Onda v975w tablets) connected to your
-          system.
+          system. It also supports 5-finger chip models, which can be
+          found on ARM tablets, like Wexler TAB7200 and MSI Primo73.
 
           If unsure, say N.
 
@@ -323,6 +337,18 @@ config TOUCHSCREEN_ILI210X
           To compile this driver as a module, choose M here: the
           module will be called ili210x.
 
+config TOUCHSCREEN_IPROC
+        tristate "IPROC touch panel driver support"
+        depends on ARCH_BCM_IPROC || COMPILE_TEST
+        help
+          Say Y here if you want to add support for the IPROC touch
+          controller to your system.
+
+          If unsure, say N.
+
+          To compile this driver as a module, choose M here: the
+          module will be called bcm_iproc_tsc.
+
 config TOUCHSCREEN_S3C2410
         tristate "Samsung S3C2410/generic touchscreen input driver"
         depends on ARCH_S3C24XX || SAMSUNG_DEV_TS
@@ -962,6 +988,17 @@ config TOUCHSCREEN_SUR40
           To compile this driver as a module, choose M here: the
           module will be called sur40.
 
+config TOUCHSCREEN_SX8654
+        tristate "Semtech SX8654 touchscreen"
+        depends on I2C
+        help
+          Say Y here if you have a Semtech SX8654 touchscreen controller.
+
+          If unsure, say N
+
+          To compile this driver as a module, choose M here: the
+          module will be called sx8654.
+
 config TOUCHSCREEN_TPS6507X
         tristate "TPS6507x based touchscreens"
         depends on I2C