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

Pull input updates from Dmitry Torokhov:

 - update the ili210x touchscreen driver, refreshing the code and adding
   support for ILI251X line

 - add support for st1633 to the st1232 touchscreen driver

 - add support for sx8650 to the the sx8654 touchscreen driver

 - add support for Evervision FT5726 to the edt-ft5x06 touchscreen
   driver

 - add support for gt5688 to the Goodix touchscreen driver

 - new vibrator driver for MSM SOCs

 - miscellaneous fixes for the rest of input drivers

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (53 commits)
  Input: wacom_serial4 - add support for Wacom ArtPad II tablet
  Input: elan_i2c - add id for touchpad found in Lenovo s21e-20
  Input: raspberrypi-ts - select CONFIG_INPUT_POLLDEV
  Input: msm-vibrator - use correct gpio header
  Input: ti_am335x_tsc - remove set but not used variable 'tscadc_dev'
  Input: i8042 - rework DT node name comparisons
  Input: goodix - print values in case of inconsistencies
  Input: goodix - refer to touchscreen.txt in device tree bindings
  Input: goodix - support Goodix gt5688
  Input: synaptics_i2c - remove redundant spinlock
  Input: db9 - mark expected switch fall-through
  Input: qt2160 - remove redundant spinlock
  Input: st1232 - handle common DT bindings
  Input: ims-pcu - switch to using brightness_set_blocking()
  Input: st1232 - switch to gpiod API
  Input: ili210x - fetch touchscreen geometry from DT
  Input: msm-vibrator - tweak an error message
  Input: tm2-touchkey - acknowledge that setting brightness is a blocking call
  Input: stmfts - acknowledge that setting brightness is a blocking call
  Input: ili210x - switch to using devm_device_add_group()
  ...

diff --combined drivers/input/misc/Kconfig
index 279fb02a0f1466544959fccefc3d0e6e2ecfe355,e39aef84f357ce1ff5357e1705555fd052dae2f8..e15ed1bb8558c69e2eda42507953e2e079e759d7
--- 1/drivers/input/misc/Kconfig
--- 2/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@@ -117,6 -117,16 +117,16 @@@ config INPUT_E3X0_BUTTO
          To compile this driver as a module, choose M here: the
          module will be called e3x0_button.
  
+ config INPUT_MSM_VIBRATOR
+       tristate "Qualcomm MSM vibrator driver"
+       select INPUT_FF_MEMLESS
+       help
+         Support for the vibrator that is found on various Qualcomm MSM
+         SOCs.
+ 
+         To compile this driver as a module, choose M here: the module
+         will be called msm_vibrator.
+ 
  config INPUT_PCSPKR
        tristate "PC Speaker support"
        depends on PCSPKR_PLATFORM
@@@ -851,15 -861,4 +861,15 @@@ config INPUT_SC27XX_VIBR
          To compile this driver as a module, choose M here. The module will
          be called sc27xx_vibra.
  
 +config INPUT_STPMIC1_ONKEY
 +      tristate "STPMIC1 PMIC Onkey support"
 +      depends on MFD_STPMIC1
 +      help
 +        Say Y to enable support of onkey embedded into STPMIC1 PMIC. onkey
 +        can be used to wakeup from low power modes and force a shut-down on
 +        long press.
 +
 +        To compile this driver as a module, choose M here: the
 +        module will be called stpmic1_onkey.
 +
  endif

diff --combined drivers/input/misc/Makefile
index 1b44202ad8f74105f7e9245971325d0a6c3367bf,96a6419cb1f25192a71c53d65ee8f772a56689a0..b936c5b1d4ac6ac99f3f86614f886b2bd788637f
--- 1/drivers/input/misc/Makefile
--- 2/drivers/input/misc/Makefile
+++ b/drivers/input/misc/Makefile
@@@ -48,6 -48,7 +48,7 @@@ obj-$(CONFIG_INPUT_MAX8925_ONKEY)     += ma
  obj-$(CONFIG_INPUT_MAX8997_HAPTIC)    += max8997_haptic.o
  obj-$(CONFIG_INPUT_MC13783_PWRBUTTON) += mc13783-pwrbutton.o
  obj-$(CONFIG_INPUT_MMA8450)           += mma8450.o
+ obj-$(CONFIG_INPUT_MSM_VIBRATOR)      += msm-vibrator.o
  obj-$(CONFIG_INPUT_PALMAS_PWRBUTTON)  += palmas-pwrbutton.o
  obj-$(CONFIG_INPUT_PCAP)              += pcap_keys.o
  obj-$(CONFIG_INPUT_PCF50633_PMU)      += pcf50633-input.o
@@@ -71,7 -72,6 +72,7 @@@ obj-$(CONFIG_INPUT_SGI_BTNS)          += sgi_bt
  obj-$(CONFIG_INPUT_SIRFSOC_ONKEY)     += sirfsoc-onkey.o
  obj-$(CONFIG_INPUT_SOC_BUTTON_ARRAY)  += soc_button_array.o
  obj-$(CONFIG_INPUT_SPARCSPKR)         += sparcspkr.o
 +obj-$(CONFIG_INPUT_STPMIC1_ONKEY)     += stpmic1_onkey.o
  obj-$(CONFIG_INPUT_TPS65218_PWRBUTTON)        += tps65218-pwrbutton.o
  obj-$(CONFIG_INPUT_TWL4030_PWRBUTTON) += twl4030-pwrbutton.o
  obj-$(CONFIG_INPUT_TWL4030_VIBRA)     += twl4030-vibra.o
@@@ -82,4 -82,3 +83,4 @@@ obj-$(CONFIG_INPUT_WM831X_ON)         += wm831
  obj-$(CONFIG_INPUT_XEN_KBDDEV_FRONTEND)       += xen-kbdfront.o
  obj-$(CONFIG_INPUT_YEALINK)           += yealink.o
  obj-$(CONFIG_INPUT_IDEAPAD_SLIDEBAR)  += ideapad_slidebar.o
 +