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

Pull input layer updates from Dmitry Torokhov:
 - a bunch of new drivers (DA9052/53 touchscreenn controller, Synaptics
   Navpoint, LM8333 keypads, Wacom I2C touhscreen);
 - updates to existing touchpad drivers (ALPS, Sntelic);
 - Wacom driver now supports Intuos5;
 - device-tree bindings in numerous drivers;
 - other cleanups and fixes.

Fix annoying conflict in drivers/input/tablet/wacom_wac.c that I think
implies that the input layer device naming is broken, but let's see.  I
brough it up with Dmitry.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (57 commits)
  Input: matrix-keymap - fix building keymaps
  Input: spear-keyboard - document DT bindings
  Input: spear-keyboard - add device tree bindings
  Input: matrix-keymap - wire up device tree support
  Input: matrix-keymap - uninline and prepare for device tree support
  Input: adp5588 - add support for gpio names
  Input: omap-keypad - dynamically handle register offsets
  Input: synaptics - fix compile warning
  MAINTAINERS: adjust input-related patterns
  Input: ALPS - switch to using input_mt_report_finger_count
  Input: ALPS - add semi-MT support for v4 protocol
  Input: Add Synaptics NavPoint (PXA27x SSP/SPI) driver
  Input: atmel_mxt_ts - dump each message on just 1 line
  Input: atmel_mxt_ts - do not read extra (checksum) byte
  Input: atmel_mxt_ts - verify object size in mxt_write_object
  Input: atmel_mxt_ts - only allow root to update firmware
  Input: atmel_mxt_ts - use CONFIG_PM_SLEEP
  Input: sentelic - report device's production serial number
  Input: tl6040-vibra - Device Tree support
  Input: evdev - properly handle read/write with count 0
  ...

1 files changed, 32 insertions, 2 deletions

diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index 75838d7710ce..98d263504eea 100644
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -187,6 +187,23 @@ config TOUCHSCREEN_DA9034
           Say Y here to enable the support for the touchscreen found
           on Dialog Semiconductor DA9034 PMIC.
 
+          If unsure, say N.
+
+          To compile this driver as a module, choose M here: the
+          module will be called da9034-ts.
+
+config TOUCHSCREEN_DA9052
+        tristate "Dialog DA9052/DA9053 TSI"
+        depends on PMIC_DA9052
+        help
+          Say Y here to support the touchscreen found on Dialog Semiconductor
+          DA9052-BC and DA9053-AA/Bx PMICs.
+
+          If unsure, say N.
+
+          To compile this driver as a module, choose M here: the
+          module will be called da9052_tsi.
+
 config TOUCHSCREEN_DYNAPRO
         tristate "Dynapro serial touchscreen"
         select SERIO
@@ -306,6 +323,18 @@ config TOUCHSCREEN_WACOM_W8001
           To compile this driver as a module, choose M here: the
           module will be called wacom_w8001.
 
+config TOUCHSCREEN_WACOM_I2C
+        tristate "Wacom Tablet support (I2C)"
+        depends on I2C
+        help
+          Say Y here if you want to use the I2C version of the Wacom
+          Pen Tablet.
+
+          If unsure, say N.
+
+          To compile this driver as a module, choose M here: the module
+          will be called wacom_i2c.
+
 config TOUCHSCREEN_LPC32XX
         tristate "LPC32XX touchscreen controller"
         depends on ARCH_LPC32XX
@@ -635,6 +664,7 @@ config TOUCHSCREEN_USB_COMPOSITE
           - Zytronic controllers
           - Elo TouchSystems 2700 IntelliTouch
           - EasyTouch USB Touch Controller from Data Modul
+          - e2i (Mimo monitors)
 
           Have a look at <http://linux.chapter7.ch/touchkit/> for
           a usage description and the required user-space stuff.
@@ -721,7 +751,7 @@ config TOUCHSCREEN_USB_ELO
 
 config TOUCHSCREEN_USB_E2I
         default y
-        bool "e2i Touchscreen controller (e.g. from Mimo 740)"
+        bool "e2i Touchscreen controller (e.g. from Mimo 740)" if EXPERT
         depends on TOUCHSCREEN_USB_COMPOSITE
 
 config TOUCHSCREEN_USB_ZYTRONIC
@@ -744,7 +774,7 @@ config TOUCHSCREEN_USB_EASYTOUCH
         bool "EasyTouch USB Touch controller device support" if EMBEDDED
         depends on TOUCHSCREEN_USB_COMPOSITE
         help
-          Say Y here if you have a EasyTouch USB Touch controller device support.
+          Say Y here if you have an EasyTouch USB Touch controller.
           If unsure, say N.
 
 config TOUCHSCREEN_TOUCHIT213