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

Pull input fixes from Dmitry Torokhov:

 - joydev now implements a blacklist to avoid creating joystick nodes
   for accelerometers found in composite devices such as PlaStation
   controllers

 - assorted driver fixes

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: ims-psu - check if CDC union descriptor is sane
  Input: joydev - blacklist ds3/ds4/udraw motion sensors
  Input: allow matching device IDs on property bits
  Input: factor out and export input_device_id matching code
  Input: goodix - poll the 'buffer status' bit before reading data
  Input: axp20x-pek - fix module not auto-loading for axp221 pek
  Input: tca8418 - enable interrupt after it has been requested
  Input: stmfts - fix setting ABS_MT_POSITION_* maximum size
  Input: ti_am335x_tsc - fix incorrect step config for 5 wire touchscreen
  Input: synaptics - disable kernel tracking on SMBus devices

diff --combined include/linux/mod_devicetable.h
index 694cebb,72f0b7f..2657f9f
--- 1/include/linux/mod_devicetable.h
--- 2/include/linux/mod_devicetable.h
+++ b/include/linux/mod_devicetable.h
@@@ -293,6 -293,7 +293,7 @@@ struct pcmcia_device_id 
  #define INPUT_DEVICE_ID_SND_MAX               0x07
  #define INPUT_DEVICE_ID_FF_MAX                0x7f
  #define INPUT_DEVICE_ID_SW_MAX                0x0f
+ #define INPUT_DEVICE_ID_PROP_MAX      0x1f
  
  #define INPUT_DEVICE_ID_MATCH_BUS     1
  #define INPUT_DEVICE_ID_MATCH_VENDOR  2
@@@ -308,6 -309,7 +309,7 @@@
  #define INPUT_DEVICE_ID_MATCH_SNDBIT  0x0400
  #define INPUT_DEVICE_ID_MATCH_FFBIT   0x0800
  #define INPUT_DEVICE_ID_MATCH_SWBIT   0x1000
+ #define INPUT_DEVICE_ID_MATCH_PROPBIT 0x2000
  
  struct input_device_id {
  
@@@ -327,6 -329,7 +329,7 @@@
        kernel_ulong_t sndbit[INPUT_DEVICE_ID_SND_MAX / BITS_PER_LONG + 1];
        kernel_ulong_t ffbit[INPUT_DEVICE_ID_FF_MAX / BITS_PER_LONG + 1];
        kernel_ulong_t swbit[INPUT_DEVICE_ID_SW_MAX / BITS_PER_LONG + 1];
+       kernel_ulong_t propbit[INPUT_DEVICE_ID_PROP_MAX / BITS_PER_LONG + 1];
  
        kernel_ulong_t driver_info;
  };
@@@ -674,6 -677,8 +677,6 @@@ struct ulpi_device_id 
   * struct fsl_mc_device_id - MC object device identifier
   * @vendor: vendor ID
   * @obj_type: MC object type
 - * @ver_major: MC object version major number
 - * @ver_minor: MC object version minor number
   *
   * Type of entries in the "device Id" table for MC object devices supported by
   * a MC object device driver. The last entry of the table has vendor set to 0x0