Merge branch 'for-linus' into next

[mirror_ubuntu-bionic-kernel.git] / drivers / input / touchscreen / Kconfig

diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index 8ecdc38fd489c0dfe8eb383a81259983a99d7d96..ee02dc7422bd1a9c03d9171b83a75e3032144bc5 100644 (file)
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -632,7 +632,7 @@ config TOUCHSCREEN_EDT_FT5X06
 
 config TOUCHSCREEN_MIGOR
        tristate "Renesas MIGO-R touchscreen"
-       depends on SH_MIGOR && I2C
+       depends on (SH_MIGOR || COMPILE_TEST) && I2C
        help
          Say Y here to enable MIGO-R touchscreen support.
 
@@ -1046,6 +1046,19 @@ config TOUCHSCREEN_PCAP
          To compile this driver as a module, choose M here: the
          module will be called pcap_ts.
 
+config TOUCHSCREEN_RM_TS
+       tristate "Raydium I2C Touchscreen"
+       depends on I2C
+       depends on GPIOLIB || COMPILE_TEST
+       help
+         Say Y here if you have Raydium series I2C touchscreen,
+         such as RM32380, connected to your system.
+
+         If unsure, say N.
+
+         To compile this driver as a module, choose M here: the
+         module will be called raydium_i2c_ts.
+
 config TOUCHSCREEN_ST1232
        tristate "Sitronix ST1232 touchscreen controllers"
        depends on I2C
@@ -1094,6 +1107,19 @@ config TOUCHSCREEN_SUR40
          To compile this driver as a module, choose M here: the
          module will be called sur40.
 
+config TOUCHSCREEN_SURFACE3_SPI
+       tristate "Ntrig/Microsoft Surface 3 SPI touchscreen"
+       depends on SPI
+       depends on GPIOLIB || COMPILE_TEST
+       help
+         Say Y here if you have the Ntrig/Microsoft SPI touchscreen
+         controller chip as found on the Surface 3 in your system.
+
+         If unsure, say N.
+
+         To compile this driver as a module, choose M here: the
+         module will be called surface3_spi.
+
 config TOUCHSCREEN_SX8654
        tristate "Semtech SX8654 touchscreen"
        depends on I2C