Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

HID: logitech - lg2ff: Add IDs for Formula Vibration Feedback Wheel

Add USB IDs for Logitech Formula Vibration Feedback Wheel (046d:ca04).

The lg2ff force feedback subdriver is used for vibration and
HID_GD_MULTIAXIS is set to avoid deadzone like other Logitech wheels.

Kconfig description etc are also updated accordingly.

Signed-off-by: Elias Vanderstuyft <Elias.vds@gmail.com>
[anssi.hannula@iki.fi: added description and CCs]
Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
Signed-off-by: Simon Wood <simon@mungewell.org>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

authored by

Elias Vanderstuyft and committed by
Jiri Kosina
bd04363d fd848319

+11 -4
+5 -3
drivers/hid/Kconfig
··· 369 369 force feedback. 370 370 371 371 config LOGIRUMBLEPAD2_FF 372 - bool "Logitech RumblePad/Rumblepad 2 force feedback support" 372 + bool "Logitech force feedback support (variant 2)" 373 373 depends on HID_LOGITECH 374 374 select INPUT_FF_MEMLESS 375 375 help 376 - Say Y here if you want to enable force feedback support for Logitech 377 - RumblePad and Rumblepad 2 devices. 376 + Say Y here if you want to enable force feedback support for: 377 + - Logitech RumblePad 378 + - Logitech Rumblepad 2 379 + - Logitech Formula Vibration Feedback Wheel 378 380 379 381 config LOGIG940_FF 380 382 bool "Logitech Flight System G940 force feedback support"
+1
drivers/hid/hid-core.c
··· 1753 1753 { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_FLIGHT_SYSTEM_G940) }, 1754 1754 { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_MOMO_WHEEL) }, 1755 1755 { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_MOMO_WHEEL2) }, 1756 + { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_VIBRATION_WHEEL) }, 1756 1757 { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_DFP_WHEEL) }, 1757 1758 { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_DFGT_WHEEL) }, 1758 1759 { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_G25_WHEEL) },
+1
drivers/hid/hid-ids.h
··· 571 571 #define USB_DEVICE_ID_DINOVO_EDGE 0xc714 572 572 #define USB_DEVICE_ID_DINOVO_MINI 0xc71f 573 573 #define USB_DEVICE_ID_LOGITECH_MOMO_WHEEL2 0xca03 574 + #define USB_DEVICE_ID_LOGITECH_VIBRATION_WHEEL 0xca04 574 575 575 576 #define USB_VENDOR_ID_LUMIO 0x202e 576 577 #define USB_DEVICE_ID_CRYSTALTOUCH 0x0006
+3
drivers/hid/hid-lg.c
··· 492 492 case USB_DEVICE_ID_LOGITECH_G27_WHEEL: 493 493 case USB_DEVICE_ID_LOGITECH_WII_WHEEL: 494 494 case USB_DEVICE_ID_LOGITECH_MOMO_WHEEL2: 495 + case USB_DEVICE_ID_LOGITECH_VIBRATION_WHEEL: 495 496 field->application = HID_GD_MULTIAXIS; 496 497 break; 497 498 default: ··· 640 639 .driver_data = LG_NOGET | LG_FF4 }, 641 640 { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_MOMO_WHEEL2), 642 641 .driver_data = LG_FF4 }, 642 + { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_VIBRATION_WHEEL), 643 + .driver_data = LG_FF2 }, 643 644 { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_G25_WHEEL), 644 645 .driver_data = LG_FF4 }, 645 646 { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_DFGT_WHEEL),
+1 -1
drivers/hid/hid-lg2ff.c
··· 95 95 96 96 hid_hw_request(hid, report, HID_REQ_SET_REPORT); 97 97 98 - hid_info(hid, "Force feedback for Logitech RumblePad/Rumblepad 2 by Anssi Hannula <anssi.hannula@gmail.com>\n"); 98 + hid_info(hid, "Force feedback for Logitech variant 2 rumble devices by Anssi Hannula <anssi.hannula@gmail.com>\n"); 99 99 100 100 return 0; 101 101 }