summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2019-05-09 07:47:04 -0400
committerJiri Kosina <jkosina@suse.cz>2019-05-09 17:17:47 -0400
commit423dfbc362b76b8a51745187a0c7e00d056d5b59 (patch)
treeeda9ba7869576313f47858f174f372b8426745a7
parentb4dd05dee0dbd16afdbba83b698a7110c687be2d (diff)
HID: logitech-dj: Add usb-id for the 27MHz MX3000 receiver
Testing has shown that, as expected, the MX3000 receiver is fully compatible with the existing 27MHz receiver support in hid-logitech-dj.c. After this the only, presumably also compatible, receiver id left in hid-lg.c is the USB_DEVICE_ID_S510_RECEIVER / 0xc50c id. If we can get someone to confirm that this receiver works with the dj 27Mhz support too, then the handling of the LG_RDESC and LG_WIRELESS quirks can be removed from hid-lg.c. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
-rw-r--r--drivers/hid/hid-lg.c2
-rw-r--r--drivers/hid/hid-logitech-dj.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/hid/hid-lg.c b/drivers/hid/hid-lg.c
index 36d725fdb199..3f6be4aebfaf 100644
--- a/drivers/hid/hid-lg.c
+++ b/drivers/hid/hid-lg.c
@@ -872,8 +872,6 @@ static void lg_remove(struct hid_device *hdev)
872} 872}
873 873
874static const struct hid_device_id lg_devices[] = { 874static const struct hid_device_id lg_devices[] = {
875 { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_MX3000_RECEIVER),
876 .driver_data = LG_RDESC | LG_WIRELESS },
877 { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_S510_RECEIVER), 875 { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_S510_RECEIVER),
878 .driver_data = LG_RDESC | LG_WIRELESS }, 876 .driver_data = LG_RDESC | LG_WIRELESS },
879 877
diff --git a/drivers/hid/hid-logitech-dj.c b/drivers/hid/hid-logitech-dj.c
index b1e894618eed..e09c8e02351c 100644
--- a/drivers/hid/hid-logitech-dj.c
+++ b/drivers/hid/hid-logitech-dj.c
@@ -1835,6 +1835,9 @@ static const struct hid_device_id logi_dj_receivers[] = {
1835 HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, 1835 HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH,
1836 USB_DEVICE_ID_LOGITECH_NANO_RECEIVER_GAMING), 1836 USB_DEVICE_ID_LOGITECH_NANO_RECEIVER_GAMING),
1837 .driver_data = recvr_type_gaming_hidpp}, 1837 .driver_data = recvr_type_gaming_hidpp},
1838 { /* Logitech 27 MHz HID++ 1.0 receiver (0xc513) */
1839 HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_MX3000_RECEIVER),
1840 .driver_data = recvr_type_27mhz},
1838 { /* Logitech 27 MHz HID++ 1.0 receiver (0xc517) */ 1841 { /* Logitech 27 MHz HID++ 1.0 receiver (0xc517) */
1839 HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, 1842 HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH,
1840 USB_DEVICE_ID_S510_RECEIVER_2), 1843 USB_DEVICE_ID_S510_RECEIVER_2),