Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: add driver for Atmel AT42QT2160 Sensor Chip
  Input: max7359 - use threaded IRQs
  Input: add driver for Maxim MAX7359 key switch controller
  Input: add driver for ADP5588 QWERTY I2C Keypad
  Input: add touchscreen driver for MELFAS MCS-5000 controller
  Input: add driver for OpenCores Keyboard Controller
  Input: dm355evm_keys - remove dm355evm_keys_hardirq
  Input: synaptics_i2c - switch to using __cancel_delayed_work()
  Input: ad7879 - add support for AD7889
  Input: atkbd - rely on input core to restore state on resume
  Input: add generic suspend and resume for input devices
  Input: libps2 - additional locking for i8042 ports

1 files changed, 14 insertions, 3 deletions

diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index ab02d72afbf3..8cc453c85ea7 100644
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -48,8 +48,8 @@ config TOUCHSCREEN_AD7879_I2C
         select TOUCHSCREEN_AD7879
         help
           Say Y here if you have a touchscreen interface using the
-          AD7879-1 controller, and your board-specific initialization
-          code includes that in its table of I2C devices.
+          AD7879-1/AD7889-1 controller, and your board-specific
+          initialization code includes that in its table of I2C devices.
 
           If unsure, say N (but it's safe to say "Y").
 
@@ -62,7 +62,7 @@ config TOUCHSCREEN_AD7879_SPI
         select TOUCHSCREEN_AD7879
         help
           Say Y here if you have a touchscreen interface using the
-          AD7879 controller, and your board-specific initialization
+          AD7879/AD7889 controller, and your board-specific initialization
           code includes that in its table of SPI devices.
 
           If unsure, say N (but it's safe to say "Y").
@@ -169,6 +169,17 @@ config TOUCHSCREEN_WACOM_W8001
           To compile this driver as a module, choose M here: the
           module will be called wacom_w8001.
 
+config TOUCHSCREEN_MCS5000
+        tristate "MELFAS MCS-5000 touchscreen"
+        depends on I2C
+        help
+          Say Y here if you have the MELFAS MCS-5000 touchscreen controller
+          chip in your system.
+
+          If unsure, say N.
+
+          To compile this driver as a module, choose M here: the
+          module will be called mcs5000_ts.
 
 config TOUCHSCREEN_MTOUCH
         tristate "MicroTouch serial touchscreens"