Merge branch 'next' into for-linus

Prepare second round of input updates for 4.3 merge window.

diff --combined drivers/input/touchscreen/Kconfig
index 80cc69897a4331105801ff3eca9339819727e3c8,2ccc52236c15b837102b6024bb480ae3107feabe..ae33da7ab51ff7f5f84464366be1c4b9f8030527
--- 1/drivers/input/touchscreen/Kconfig
--- 2/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@@ -939,10 -939,27 +939,27 @@@ config TOUCHSCREEN_TSC_SERI
          To compile this driver as a module, choose M here: the
          module will be called tsc40.
  
+ config TOUCHSCREEN_TSC200X_CORE
+       tristate
+ 
+ config TOUCHSCREEN_TSC2004
+       tristate "TSC2004 based touchscreens"
+       depends on I2C
+       select REGMAP_I2C
+       select TOUCHSCREEN_TSC200X_CORE
+       help
+         Say Y here if you have a TSC2004 based touchscreen.
+ 
+         If unsure, say N.
+ 
+         To compile this driver as a module, choose M here: the
+         module will be called tsc2004.
+ 
  config TOUCHSCREEN_TSC2005
        tristate "TSC2005 based touchscreens"
        depends on SPI_MASTER
        select REGMAP_SPI
+       select TOUCHSCREEN_TSC200X_CORE
        help
          Say Y here if you have a TSC2005 based touchscreen.
  
@@@ -1019,7 -1036,6 +1036,7 @@@ config TOUCHSCREEN_SUN4
  config TOUCHSCREEN_SUR40
        tristate "Samsung SUR40 (Surface 2.0/PixelSense) touchscreen"
        depends on USB && MEDIA_USB_SUPPORT && HAS_DMA
 +      depends on VIDEO_V4L2
        select INPUT_POLLDEV
        select VIDEOBUF2_DMA_SG
        help