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

HID: elecom: Add support for ELECOM M-XT3URBK (018F)

The ELECOM M-XT3URBK trackball has an additional device ID (0x018F), which
shares the same report descriptor as the existing device (0x00FB). However,
the driver does not currently recognize this new ID, resulting in only five
buttons being functional.

This patch adds the new device ID so that all six buttons work properly.

Signed-off-by: Naoki Ueki <naoki25519@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.com>

authored by

Naoki Ueki and committed by
Jiri Kosina cdcbb8e8 534ca75e

+8 -4
+4 -2
drivers/hid/hid-elecom.c
··· 75 75 */ 76 76 mouse_button_fixup(hdev, rdesc, *rsize, 20, 28, 22, 14, 8); 77 77 break; 78 - case USB_DEVICE_ID_ELECOM_M_XT3URBK: 78 + case USB_DEVICE_ID_ELECOM_M_XT3URBK_00FB: 79 + case USB_DEVICE_ID_ELECOM_M_XT3URBK_018F: 79 80 case USB_DEVICE_ID_ELECOM_M_XT3DRBK: 80 81 case USB_DEVICE_ID_ELECOM_M_XT4DRBK: 81 82 /* ··· 120 119 static const struct hid_device_id elecom_devices[] = { 121 120 { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_BM084) }, 122 121 { HID_USB_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_M_XGL20DLBK) }, 123 - { HID_USB_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_M_XT3URBK) }, 122 + { HID_USB_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_M_XT3URBK_00FB) }, 123 + { HID_USB_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_M_XT3URBK_018F) }, 124 124 { HID_USB_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_M_XT3DRBK) }, 125 125 { HID_USB_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_M_XT4DRBK) }, 126 126 { HID_USB_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_M_DT1URBK) },
+2 -1
drivers/hid/hid-ids.h
··· 449 449 #define USB_VENDOR_ID_ELECOM 0x056e 450 450 #define USB_DEVICE_ID_ELECOM_BM084 0x0061 451 451 #define USB_DEVICE_ID_ELECOM_M_XGL20DLBK 0x00e6 452 - #define USB_DEVICE_ID_ELECOM_M_XT3URBK 0x00fb 452 + #define USB_DEVICE_ID_ELECOM_M_XT3URBK_00FB 0x00fb 453 + #define USB_DEVICE_ID_ELECOM_M_XT3URBK_018F 0x018f 453 454 #define USB_DEVICE_ID_ELECOM_M_XT3DRBK 0x00fc 454 455 #define USB_DEVICE_ID_ELECOM_M_XT4DRBK 0x00fd 455 456 #define USB_DEVICE_ID_ELECOM_M_DT1URBK 0x00fe
+2 -1
drivers/hid/hid-quirks.c
··· 410 410 #if IS_ENABLED(CONFIG_HID_ELECOM) 411 411 { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_BM084) }, 412 412 { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_M_XGL20DLBK) }, 413 - { HID_USB_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_M_XT3URBK) }, 413 + { HID_USB_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_M_XT3URBK_00FB) }, 414 + { HID_USB_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_M_XT3URBK_018F) }, 414 415 { HID_USB_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_M_XT3DRBK) }, 415 416 { HID_USB_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_M_XT4DRBK) }, 416 417 { HID_USB_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_M_DT1URBK) },