Merge branch 'for-5.13/thrustmaster' into for-linus

- support for initialization of some newer Thrustmaster wheels from
  Dario Pagani

diff --combined drivers/hid/Kconfig
index f042c74,f1acb65..4bf263c
--- 1/drivers/hid/Kconfig
--- 2/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@@ -351,17 -351,6 +351,17 @@@ config HID_EZKE
        help
        Support for Ezkey BTC 8193 keyboard.
  
 +config HID_FT260
 +      tristate "FTDI FT260 USB HID to I2C host support"
 +      depends on USB_HID && HIDRAW && I2C
 +      help
 +        Provides I2C host adapter functionality over USB-HID through FT260
 +        device. The customizable USB descriptor fields are exposed as sysfs
 +        attributes.
 +
 +        To compile this driver as a module, choose M here: the module
 +        will be called hid-ft260.
 +
  config HID_GEMBIRD
        tristate "Gembird Joypad"
        depends on HID
@@@ -1053,10 -1042,11 +1053,11 @@@ config HID_THING
  
  config HID_THRUSTMASTER
        tristate "ThrustMaster devices support"
-       depends on HID
+       depends on USB_HID
        help
-         Say Y here if you have a THRUSTMASTER FireStore Dual Power 2 or
-         a THRUSTMASTER Ferrari GT Rumble Wheel.
+         Say Y here if you have a THRUSTMASTER FireStore Dual Power 2,
+         a THRUSTMASTER Ferrari GT Rumble Wheel or Thrustmaster FFB
+         Wheel (T150RS, T300RS, T300 Ferrari Alcantara Edition, T500RS).
  
  config THRUSTMASTER_FF
        bool "ThrustMaster devices force feedback support"
@@@ -1217,6 -1207,4 +1218,6 @@@ source "drivers/hid/intel-ish-hid/Kconf
  
  source "drivers/hid/amd-sfh-hid/Kconfig"
  
 +source "drivers/hid/surface-hid/Kconfig"
 +
  endmenu

diff --combined drivers/hid/Makefile
index a664a49,bca89f7..193431e
--- 1/drivers/hid/Makefile
--- 2/drivers/hid/Makefile
+++ b/drivers/hid/Makefile
@@@ -46,7 -46,6 +46,7 @@@ obj-$(CONFIG_HID_ELAN)                += hid-elan.
  obj-$(CONFIG_HID_ELECOM)      += hid-elecom.o
  obj-$(CONFIG_HID_ELO)         += hid-elo.o
  obj-$(CONFIG_HID_EZKEY)               += hid-ezkey.o
 +obj-$(CONFIG_HID_FT260)               += hid-ft260.o
  obj-$(CONFIG_HID_GEMBIRD)     += hid-gembird.o
  obj-$(CONFIG_HID_GFRM)                += hid-gfrm.o
  obj-$(CONFIG_HID_GLORIOUS)  += hid-glorious.o
@@@ -113,7 -112,8 +113,8 @@@ obj-$(CONFIG_HID_STEAM)            += hid-steam.
  obj-$(CONFIG_HID_STEELSERIES) += hid-steelseries.o
  obj-$(CONFIG_HID_SUNPLUS)     += hid-sunplus.o
  obj-$(CONFIG_HID_GREENASIA)   += hid-gaff.o
- obj-$(CONFIG_HID_THRUSTMASTER)        += hid-tmff.o
+ obj-$(CONFIG_HID_THRUSTMASTER)        += hid-tmff.o hid-thrustmaster.o
+ obj-$(CONFIG_HID_TMINIT)      += hid-tminit.o
  obj-$(CONFIG_HID_TIVO)                += hid-tivo.o
  obj-$(CONFIG_HID_TOPSEED)     += hid-topseed.o
  obj-$(CONFIG_HID_TWINHAN)     += hid-twinhan.o
@@@ -146,5 -146,3 +147,5 @@@ obj-$(CONFIG_INTEL_ISH_HID)        += intel-is
  obj-$(INTEL_ISH_FIRMWARE_DOWNLOADER)  += intel-ish-hid/
  
  obj-$(CONFIG_AMD_SFH_HID)       += amd-sfh-hid/
 +
 +obj-$(CONFIG_SURFACE_HID_CORE)  += surface-hid/

diff --combined drivers/hid/hid-quirks.c
index 3816be7,849c713..3dd6f15
--- 1/drivers/hid/hid-quirks.c
--- 2/drivers/hid/hid-quirks.c
+++ b/drivers/hid/hid-quirks.c
@@@ -445,6 -445,8 +445,6 @@@ static const struct hid_device_id hid_h
        { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_S510_RECEIVER) },
        { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_RECEIVER) },
        { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_DINOVO_DESKTOP) },
 -      { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_DINOVO_EDGE) },
 -      { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_DINOVO_MINI) },
        { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_ELITE_KBD) },
        { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_CORDLESS_DESKTOP_LX500) },
        { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_EXTREME_3D) },
@@@ -659,6 -661,9 +659,9 @@@
        { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb654) },
        { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb65a) },
  #endif
+ #if IS_ENABLED(CONFIG_HID_TMINIT)
+       { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb65d) },
+ #endif
  #if IS_ENABLED(CONFIG_HID_TIVO)
        { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_TIVO, USB_DEVICE_ID_TIVO_SLIDE_BT) },
        { HID_USB_DEVICE(USB_VENDOR_ID_TIVO, USB_DEVICE_ID_TIVO_SLIDE) },