aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Wood <simon@mungewell.org>2015-07-23 21:10:03 -0400
committerJiri Kosina <jkosina@suse.com>2015-07-29 08:09:14 -0400
commitc873d9aba7c9782b4dc74488ab964ed6cf54678f (patch)
tree41bec1a2c7c6699e6ce397d2baa188a907872ae4
parent874bf9ee69cdebc1e734a391d6b2fa3e08c9ff87 (diff)
HID: hid-lg: Add USBID for Logitech G29 Wheel
Since this wheel is now available, and the USBID is listed on their website, this patch adds it to allow the hid-lg4ff force feedback driver to find it. I do not have this wheel to test with, but this should at least get it working in emulation mode. Note: There is probably more work required for adjust HID descriptor and handle switching between emulation and native modes. Signed-off-by: Simon Wood <simon@mungewell.org> Signed-off-by: Jiri Kosina <jkosina@suse.com>
-rw-r--r--drivers/hid/hid-ids.h1
-rw-r--r--drivers/hid/hid-lg.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index b04b0820d816..653bfd4b9490 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -599,6 +599,7 @@
599#define USB_DEVICE_ID_LOGITECH_DUAL_ACTION 0xc216 599#define USB_DEVICE_ID_LOGITECH_DUAL_ACTION 0xc216
600#define USB_DEVICE_ID_LOGITECH_RUMBLEPAD2 0xc218 600#define USB_DEVICE_ID_LOGITECH_RUMBLEPAD2 0xc218
601#define USB_DEVICE_ID_LOGITECH_RUMBLEPAD2_2 0xc219 601#define USB_DEVICE_ID_LOGITECH_RUMBLEPAD2_2 0xc219
602#define USB_DEVICE_ID_LOGITECH_G29_WHEEL 0xc24f
602#define USB_DEVICE_ID_LOGITECH_WINGMAN_F3D 0xc283 603#define USB_DEVICE_ID_LOGITECH_WINGMAN_F3D 0xc283
603#define USB_DEVICE_ID_LOGITECH_FORCE3D_PRO 0xc286 604#define USB_DEVICE_ID_LOGITECH_FORCE3D_PRO 0xc286
604#define USB_DEVICE_ID_LOGITECH_FLIGHT_SYSTEM_G940 0xc287 605#define USB_DEVICE_ID_LOGITECH_FLIGHT_SYSTEM_G940 0xc287
diff --git a/drivers/hid/hid-lg.c b/drivers/hid/hid-lg.c
index 429340d809b5..5332fb7d072a 100644
--- a/drivers/hid/hid-lg.c
+++ b/drivers/hid/hid-lg.c
@@ -776,6 +776,8 @@ static const struct hid_device_id lg_devices[] = {
776 .driver_data = LG_FF }, 776 .driver_data = LG_FF },
777 { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_RUMBLEPAD2_2), 777 { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_RUMBLEPAD2_2),
778 .driver_data = LG_FF }, 778 .driver_data = LG_FF },
779 { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_G29_WHEEL),
780 .driver_data = LG_FF4 },
779 { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_WINGMAN_F3D), 781 { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_WINGMAN_F3D),
780 .driver_data = LG_FF }, 782 .driver_data = LG_FF },
781 { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_FORCE3D_PRO), 783 { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_FORCE3D_PRO),