Commit cdcbb8e8 authored by Naoki Ueki's avatar Naoki Ueki Committed by Jiri Kosina
Browse files

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: default avatarNaoki Ueki <naoki25519@gmail.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.com>
parent 534ca75e

drivers/hid/hid-elecom.c

+4 −2
Original line number Diff line number Diff line
@@ -75,7 +75,8 @@ static const __u8 *elecom_report_fixup(struct hid_device *hdev, __u8 *rdesc, 
		 */

		mouse_button_fixup(hdev, rdesc, *rsize, 20, 28, 22, 14, 8);

		break;

	case USB_DEVICE_ID_ELECOM_M_XT3URBK:

	case USB_DEVICE_ID_ELECOM_M_XT3URBK_00FB:

	case USB_DEVICE_ID_ELECOM_M_XT3URBK_018F:

	case USB_DEVICE_ID_ELECOM_M_XT3DRBK:

	case USB_DEVICE_ID_ELECOM_M_XT4DRBK:

		/*
@@ -119,7 +120,8 @@ static const __u8 *elecom_report_fixup(struct hid_device *hdev, __u8 *rdesc, 
static const struct hid_device_id elecom_devices[] = {

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_BM084) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_M_XGL20DLBK) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_M_XT3URBK) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_M_XT3URBK_00FB) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_M_XT3URBK_018F) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_M_XT3DRBK) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_M_XT4DRBK) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_M_DT1URBK) },

drivers/hid/hid-ids.h

+2 −1
Original line number Diff line number Diff line
@@ -449,7 +449,8 @@ 
#define USB_VENDOR_ID_ELECOM		0x056e

#define USB_DEVICE_ID_ELECOM_BM084	0x0061

#define USB_DEVICE_ID_ELECOM_M_XGL20DLBK	0x00e6

#define USB_DEVICE_ID_ELECOM_M_XT3URBK	0x00fb

#define USB_DEVICE_ID_ELECOM_M_XT3URBK_00FB	0x00fb

#define USB_DEVICE_ID_ELECOM_M_XT3URBK_018F	0x018f

#define USB_DEVICE_ID_ELECOM_M_XT3DRBK	0x00fc

#define USB_DEVICE_ID_ELECOM_M_XT4DRBK	0x00fd

#define USB_DEVICE_ID_ELECOM_M_DT1URBK	0x00fe

drivers/hid/hid-quirks.c

+2 −1
Original line number Diff line number Diff line
@@ -410,7 +410,8 @@ static const struct hid_device_id hid_have_special_driver[] = { 
#if IS_ENABLED(CONFIG_HID_ELECOM)

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_BM084) },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_M_XGL20DLBK) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_M_XT3URBK) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_M_XT3URBK_00FB) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_M_XT3URBK_018F) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_M_XT3DRBK) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_M_XT4DRBK) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_M_DT1URBK) },