Merge tag 'v5.1' into next

[sfrench/cifs-2.6.git] / drivers / input / touchscreen / Kconfig

diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index 068dbbc610fce4d8c9f79c7a9466cd39614ed625..a2029c3235af7e627ce7459fd6f7511ae7918c38 100644 (file)
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -699,6 +699,7 @@ config TOUCHSCREEN_EDT_FT5X06
 config TOUCHSCREEN_RASPBERRYPI_FW
        tristate "Raspberry Pi's firmware base touch screen support"
        depends on RASPBERRYPI_FIRMWARE || (RASPBERRYPI_FIRMWARE=n && COMPILE_TEST)
+       select INPUT_POLLDEV
        help
          Say Y here if you have the official Raspberry Pi 7 inch screen on
          your system.
@@ -1168,11 +1169,11 @@ config TOUCHSCREEN_SIS_I2C
          module will be called sis_i2c.
 
 config TOUCHSCREEN_ST1232
-       tristate "Sitronix ST1232 touchscreen controllers"
+       tristate "Sitronix ST1232 or ST1633 touchscreen controllers"
        depends on I2C
        help
-         Say Y here if you want to support Sitronix ST1232
-         touchscreen controller.
+         Say Y here if you want to support the Sitronix ST1232
+         or ST1633 touchscreen controller.
 
          If unsure, say N.
 
@@ -1311,4 +1312,14 @@ config TOUCHSCREEN_ROHM_BU21023
          To compile this driver as a module, choose M here: the
          module will be called bu21023_ts.
 
+config TOUCHSCREEN_IQS5XX
+       tristate "Azoteq IQS550/572/525 trackpad/touchscreen controller"
+       depends on I2C
+       help
+         Say Y to enable support for the Azoteq IQS550/572/525
+         family of trackpad/touchscreen controllers.
+
+         To compile this driver as a module, choose M here: the
+         module will be called iqs5xx.
+
 endif