diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/hid/Kconfig | 8 | ||||
-rw-r--r-- | drivers/hid/hid-core.c | 1 | ||||
-rw-r--r-- | drivers/hid/hid-ids.h | 1 | ||||
-rw-r--r-- | drivers/hid/hid-lg.c | 3 | ||||
-rw-r--r-- | drivers/hid/hid-lg2ff.c | 2 |
5 files changed, 11 insertions, 4 deletions
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index c91d547191dd..46fd27f6f026 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig | |||
@@ -369,12 +369,14 @@ config LOGITECH_FF | |||
369 | force feedback. | 369 | force feedback. |
370 | 370 | ||
371 | config LOGIRUMBLEPAD2_FF | 371 | config LOGIRUMBLEPAD2_FF |
372 | bool "Logitech RumblePad/Rumblepad 2 force feedback support" | 372 | bool "Logitech force feedback support (variant 2)" |
373 | depends on HID_LOGITECH | 373 | depends on HID_LOGITECH |
374 | select INPUT_FF_MEMLESS | 374 | select INPUT_FF_MEMLESS |
375 | help | 375 | help |
376 | Say Y here if you want to enable force feedback support for Logitech | 376 | Say Y here if you want to enable force feedback support for: |
377 | RumblePad and Rumblepad 2 devices. | 377 | - Logitech RumblePad |
378 | - Logitech Rumblepad 2 | ||
379 | - Logitech Formula Vibration Feedback Wheel | ||
378 | 380 | ||
379 | config LOGIG940_FF | 381 | config LOGIG940_FF |
380 | bool "Logitech Flight System G940 force feedback support" | 382 | bool "Logitech Flight System G940 force feedback support" |
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index 5a8c01112a23..95d2dff0a7ee 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c | |||
@@ -1753,6 +1753,7 @@ static const struct hid_device_id hid_have_special_driver[] = { | |||
1753 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_FLIGHT_SYSTEM_G940) }, | 1753 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_FLIGHT_SYSTEM_G940) }, |
1754 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_MOMO_WHEEL) }, | 1754 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_MOMO_WHEEL) }, |
1755 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_MOMO_WHEEL2) }, | 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 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_DFP_WHEEL) }, | 1757 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_DFP_WHEEL) }, |
1757 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_DFGT_WHEEL) }, | 1758 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_DFGT_WHEEL) }, |
1758 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_G25_WHEEL) }, | 1759 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_G25_WHEEL) }, |
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 9cbc7ab07dfa..312d7fd20ee1 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h | |||
@@ -571,6 +571,7 @@ | |||
571 | #define USB_DEVICE_ID_DINOVO_EDGE 0xc714 | 571 | #define USB_DEVICE_ID_DINOVO_EDGE 0xc714 |
572 | #define USB_DEVICE_ID_DINOVO_MINI 0xc71f | 572 | #define USB_DEVICE_ID_DINOVO_MINI 0xc71f |
573 | #define USB_DEVICE_ID_LOGITECH_MOMO_WHEEL2 0xca03 | 573 | #define USB_DEVICE_ID_LOGITECH_MOMO_WHEEL2 0xca03 |
574 | #define USB_DEVICE_ID_LOGITECH_VIBRATION_WHEEL 0xca04 | ||
574 | 575 | ||
575 | #define USB_VENDOR_ID_LUMIO 0x202e | 576 | #define USB_VENDOR_ID_LUMIO 0x202e |
576 | #define USB_DEVICE_ID_CRYSTALTOUCH 0x0006 | 577 | #define USB_DEVICE_ID_CRYSTALTOUCH 0x0006 |
diff --git a/drivers/hid/hid-lg.c b/drivers/hid/hid-lg.c index 6f12ecd36c88..c2c7dab7d2c4 100644 --- a/drivers/hid/hid-lg.c +++ b/drivers/hid/hid-lg.c | |||
@@ -492,6 +492,7 @@ static int lg_input_mapped(struct hid_device *hdev, struct hid_input *hi, | |||
492 | case USB_DEVICE_ID_LOGITECH_G27_WHEEL: | 492 | case USB_DEVICE_ID_LOGITECH_G27_WHEEL: |
493 | case USB_DEVICE_ID_LOGITECH_WII_WHEEL: | 493 | case USB_DEVICE_ID_LOGITECH_WII_WHEEL: |
494 | case USB_DEVICE_ID_LOGITECH_MOMO_WHEEL2: | 494 | case USB_DEVICE_ID_LOGITECH_MOMO_WHEEL2: |
495 | case USB_DEVICE_ID_LOGITECH_VIBRATION_WHEEL: | ||
495 | field->application = HID_GD_MULTIAXIS; | 496 | field->application = HID_GD_MULTIAXIS; |
496 | break; | 497 | break; |
497 | default: | 498 | default: |
@@ -639,6 +640,8 @@ static const struct hid_device_id lg_devices[] = { | |||
639 | .driver_data = LG_NOGET | LG_FF4 }, | 640 | .driver_data = LG_NOGET | LG_FF4 }, |
640 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_MOMO_WHEEL2), | 641 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_MOMO_WHEEL2), |
641 | .driver_data = LG_FF4 }, | 642 | .driver_data = LG_FF4 }, |
643 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_VIBRATION_WHEEL), | ||
644 | .driver_data = LG_FF2 }, | ||
642 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_G25_WHEEL), | 645 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_G25_WHEEL), |
643 | .driver_data = LG_FF4 }, | 646 | .driver_data = LG_FF4 }, |
644 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_DFGT_WHEEL), | 647 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_DFGT_WHEEL), |
diff --git a/drivers/hid/hid-lg2ff.c b/drivers/hid/hid-lg2ff.c index 1a42eaa6ca02..0e3fb1a7e421 100644 --- a/drivers/hid/hid-lg2ff.c +++ b/drivers/hid/hid-lg2ff.c | |||
@@ -95,7 +95,7 @@ int lg2ff_init(struct hid_device *hid) | |||
95 | 95 | ||
96 | hid_hw_request(hid, report, HID_REQ_SET_REPORT); | 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 | return 0; | 100 | return 0; |
101 | } | 101 | } |