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

Pull second round of input updates from Dmitry Torokhov:
 "A new driver for Weida wdt87xx touch controllers, and a bunch of
  fixups for other drivers"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: wdt87xx_i2c - add a scaling factor for TOUCH_MAJOR event
  Input: wdt87xx_i2c - remove stray newline in diagnostic message
  Input: arc_ps2 - add HAS_IOMEM dependency
  Input: wdt87xx_i2c - fix format warning
  Input: improve parsing OF parameters for touchscreens
  Input: edt-ft5x06 - mark as direct input device
  Input: use for_each_set_bit() where appropriate
  Input: add a driver for wdt87xx touchscreen controller
  Input: axp20x-pek - fix reporting button state as inverted
  Input: xpad - re-send LED command on present event
  Input: xpad - set the LEDs properly on XBox Wireless controllers
  Input: imx_keypad - check for clk_prepare_enable() error

diff --combined drivers/input/touchscreen/Kconfig
index d20fe1dff403ed78cdf33f6c7113629d2beef4f9,aa2b5f21b89b44d4114eb5307cc7be681fd3adb5..a854c6e5f09eca6d01515ae09065eaa31bc364e8
--- 1/drivers/input/touchscreen/Kconfig
--- 2/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@@ -658,6 -658,18 +658,18 @@@ config TOUCHSCREEN_PIXCI
          To compile this driver as a module, choose M here: the
          module will be called pixcir_i2c_ts.
  
+ config TOUCHSCREEN_WDT87XX_I2C
+       tristate "Weida HiTech I2C touchscreen"
+       depends on I2C
+       help
+         Say Y here if you have a Weida WDT87XX I2C touchscreen
+         connected to your system.
+ 
+         If unsure, say N.
+ 
+         To compile this driver as a module, choose M here: the
+         module will be called wdt87xx_i2c.
+ 
  config TOUCHSCREEN_WM831X
        tristate "Support for WM831x touchscreen controllers"
        depends on MFD_WM831X
@@@ -980,9 -992,8 +992,9 @@@ config TOUCHSCREEN_SUN4
  
  config TOUCHSCREEN_SUR40
        tristate "Samsung SUR40 (Surface 2.0/PixelSense) touchscreen"
 -      depends on USB
 +      depends on USB && MEDIA_USB_SUPPORT && HAS_DMA
        select INPUT_POLLDEV
 +      select VIDEOBUF2_DMA_SG
        help
          Say Y here if you want support for the Samsung SUR40 touchscreen
          (also known as Microsoft Surface 2.0 or Microsoft PixelSense).