Skip to content

Commit 5a4a13c

Browse files
author
Jiri Kosina
committed
Merge branch 'for-5.13/thrustmaster' into for-linus
- support for initialization of some newer Thrustmaster wheels from Dario Pagani
2 parents e50fede + e9bb37f commit 5a4a13c

File tree

4 files changed

+380
-4
lines changed

4 files changed

+380
-4
lines changed

drivers/hid/Kconfig

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1053,10 +1053,11 @@ config HID_THINGM
10531053

10541054
config HID_THRUSTMASTER
10551055
tristate "ThrustMaster devices support"
1056-
depends on HID
1056+
depends on USB_HID
10571057
help
1058-
Say Y here if you have a THRUSTMASTER FireStore Dual Power 2 or
1059-
a THRUSTMASTER Ferrari GT Rumble Wheel.
1058+
Say Y here if you have a THRUSTMASTER FireStore Dual Power 2,
1059+
a THRUSTMASTER Ferrari GT Rumble Wheel or Thrustmaster FFB
1060+
Wheel (T150RS, T300RS, T300 Ferrari Alcantara Edition, T500RS).
10601061

10611062
config THRUSTMASTER_FF
10621063
bool "ThrustMaster devices force feedback support"

drivers/hid/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,8 @@ obj-$(CONFIG_HID_STEAM) += hid-steam.o
113113
obj-$(CONFIG_HID_STEELSERIES) += hid-steelseries.o
114114
obj-$(CONFIG_HID_SUNPLUS) += hid-sunplus.o
115115
obj-$(CONFIG_HID_GREENASIA) += hid-gaff.o
116-
obj-$(CONFIG_HID_THRUSTMASTER) += hid-tmff.o
116+
obj-$(CONFIG_HID_THRUSTMASTER) += hid-tmff.o hid-thrustmaster.o
117+
obj-$(CONFIG_HID_TMINIT) += hid-tminit.o
117118
obj-$(CONFIG_HID_TIVO) += hid-tivo.o
118119
obj-$(CONFIG_HID_TOPSEED) += hid-topseed.o
119120
obj-$(CONFIG_HID_TWINHAN) += hid-twinhan.o

drivers/hid/hid-quirks.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -659,6 +659,9 @@ static const struct hid_device_id hid_have_special_driver[] = {
659659
{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb654) },
660660
{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb65a) },
661661
#endif
662+
#if IS_ENABLED(CONFIG_HID_TMINIT)
663+
{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb65d) },
664+
#endif
662665
#if IS_ENABLED(CONFIG_HID_TIVO)
663666
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_TIVO, USB_DEVICE_ID_TIVO_SLIDE_BT) },
664667
{ HID_USB_DEVICE(USB_VENDOR_ID_TIVO, USB_DEVICE_ID_TIVO_SLIDE) },

0 commit comments

Comments
 (0)