Merge branch 'for-4.20/microsoft' into for-linus

Rumble support for Xbox One S

diff --combined drivers/hid/Kconfig
index 6d62e19f1a879b075f4c8bbc8dd4c9c87a608ca2,e5ec47705fa2bff1babdbe26d6644c1a32a1cbd3..18c846477ba2586f7ba6381aea515990d4c915a7
--- 1/drivers/hid/Kconfig
--- 2/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@@ -182,19 -182,6 +182,19 @@@ config HID_BETOP_F
        Currently the following devices are known to be supported:
         - BETOP 2185 PC & BFM MODE
  
 +config HID_BIGBEN_FF
 +      tristate "BigBen Interactive Kids' gamepad support"
 +      depends on USB_HID
 +      depends on NEW_LEDS
 +      depends on LEDS_CLASS
 +      select INPUT_FF_MEMLESS
 +      default !EXPERT
 +      help
 +        Support for the "Kid-friendly Wired Controller" PS3OFMINIPAD
 +        gamepad made by BigBen Interactive, originally sold as a PS3
 +        accessory. This driver fixes input mapping and adds support for
 +        force feedback effects and LEDs on the device.
 +
  config HID_CHERRY
        tristate "Cherry Cymotion keyboard"
        depends on HID
@@@ -364,7 -351,7 +364,7 @@@ config HOLTEK_F
  
  config HID_GOOGLE_HAMMER
        tristate "Google Hammer Keyboard"
 -      depends on USB_HID && LEDS_CLASS
 +      depends on USB_HID && LEDS_CLASS && MFD_CROS_EC
        ---help---
        Say Y here if you have a Google Hammer device.
  
@@@ -609,6 -596,7 +609,7 @@@ config HID_MICROSOF
        tristate "Microsoft non-fully HID-compliant devices"
        depends on HID
        default !EXPERT
+       select INPUT_FF_MEMLESS
        ---help---
        Support for Microsoft devices that are not fully compliant with HID standard.
  

diff --combined drivers/hid/hid-ids.h
index c5233389836beb071ded651ec39cc643dc1417e4,a523d54c4f7583cfa2fa27dc677b04487b12cf53..f63489c882bb64f98f4c5bf9c84cbeb9df192c71
--- 1/drivers/hid/hid-ids.h
--- 2/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@@ -88,11 -88,9 +88,11 @@@
  #define USB_DEVICE_ID_ANTON_TOUCH_PAD 0x3101
  
  #define USB_VENDOR_ID_APPLE           0x05ac
 +#define BT_VENDOR_ID_APPLE            0x004c
  #define USB_DEVICE_ID_APPLE_MIGHTYMOUSE       0x0304
  #define USB_DEVICE_ID_APPLE_MAGICMOUSE        0x030d
  #define USB_DEVICE_ID_APPLE_MAGICTRACKPAD     0x030e
 +#define USB_DEVICE_ID_APPLE_MAGICTRACKPAD2    0x0265
  #define USB_DEVICE_ID_APPLE_FOUNTAIN_ANSI     0x020e
  #define USB_DEVICE_ID_APPLE_FOUNTAIN_ISO      0x020f
  #define USB_DEVICE_ID_APPLE_GEYSER_ANSI       0x0214
@@@ -159,7 -157,6 +159,7 @@@
  #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ISO   0x0256
  #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_JIS   0x0257
  #define USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_ANSI   0x0267
 +#define USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_NUMPAD_ANSI   0x026c
  #define USB_DEVICE_ID_APPLE_WELLSPRING8_ANSI  0x0290
  #define USB_DEVICE_ID_APPLE_WELLSPRING8_ISO   0x0291
  #define USB_DEVICE_ID_APPLE_WELLSPRING8_JIS   0x0292
@@@ -230,9 -227,6 +230,9 @@@
  #define USB_VENDOR_ID_BETOP_2185V2PC  0x8380
  #define USB_VENDOR_ID_BETOP_2185V2BFM 0x20bc
  
 +#define USB_VENDOR_ID_BIGBEN  0x146b
 +#define USB_DEVICE_ID_BIGBEN_PS3OFMINIPAD     0x0902
 +
  #define USB_VENDOR_ID_BTC             0x046e
  #define USB_DEVICE_ID_BTC_EMPREX_REMOTE       0x5578
  #define USB_DEVICE_ID_BTC_EMPREX_REMOTE_2     0x5577
@@@ -346,7 -340,6 +346,7 @@@
  #define USB_DEVICE_ID_DMI_ENC         0x5fab
  
  #define USB_VENDOR_ID_DRAGONRISE              0x0079
 +#define USB_DEVICE_ID_REDRAGON_SEYMUR2                0x0006
  #define USB_DEVICE_ID_DRAGONRISE_WIIU         0x1800
  #define USB_DEVICE_ID_DRAGONRISE_PS3          0x1801
  #define USB_DEVICE_ID_DRAGONRISE_DOLPHINBAR   0x1803
@@@ -535,6 -528,9 +535,6 @@@
  #define I2C_VENDOR_ID_HANTICK         0x0911
  #define I2C_PRODUCT_ID_HANTICK_5288   0x5288
  
 -#define I2C_VENDOR_ID_RAYD            0x2386
 -#define I2C_PRODUCT_ID_RAYD_3118      0x3118
 -
  #define USB_VENDOR_ID_HANWANG         0x0b57
  #define USB_DEVICE_ID_HANWANG_TABLET_FIRST    0x5000
  #define USB_DEVICE_ID_HANWANG_TABLET_LAST     0x8fff
@@@ -804,6 -800,7 +804,7 @@@
  #define USB_DEVICE_ID_MS_TOUCH_COVER_2   0x07a7
  #define USB_DEVICE_ID_MS_TYPE_COVER_2    0x07a9
  #define USB_DEVICE_ID_MS_POWER_COVER     0x07da
+ #define USB_DEVICE_ID_MS_XBOX_ONE_S_CONTROLLER        0x02fd
  
  #define USB_VENDOR_ID_MOJO            0x8282
  #define USB_DEVICE_ID_RETRO_ADAPTER   0x3201
@@@ -954,7 -951,6 +955,7 @@@
  #define USB_DEVICE_ID_SAITEK_RUMBLEPAD        0xff17
  #define USB_DEVICE_ID_SAITEK_PS1000   0x0621
  #define USB_DEVICE_ID_SAITEK_RAT7_OLD 0x0ccb
 +#define USB_DEVICE_ID_SAITEK_RAT7_CONTAGION   0x0ccd
  #define USB_DEVICE_ID_SAITEK_RAT7     0x0cd7
  #define USB_DEVICE_ID_SAITEK_RAT9     0x0cfa
  #define USB_DEVICE_ID_SAITEK_MMO7     0x0cd0
@@@ -981,6 -977,7 +982,6 @@@
  #define USB_DEVICE_ID_SIS817_TOUCH    0x0817
  #define USB_DEVICE_ID_SIS_TS          0x1013
  #define USB_DEVICE_ID_SIS1030_TOUCH   0x1030
 -#define USB_DEVICE_ID_SIS10FB_TOUCH   0x10fb
  
  #define USB_VENDOR_ID_SKYCABLE                        0x1223
  #define       USB_DEVICE_ID_SKYCABLE_WIRELESS_PRESENTER       0x3F07