Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6d9ab208 authored by Chris Ye's avatar Chris Ye Committed by Greg Kroah-Hartman
Browse files

FROMGIT: Input: Add devices for HID_QUIRK_INCREMENT_USAGE_ON_DUPLICATE 

Kernel 5.4 introduces HID_QUIRK_INCREMENT_USAGE_ON_DUPLICATE, devices
need to be set explicitly with this flag.

Bug: 170072925
Bug: 170126889
Tests: atest android.hardware.input.cts.tests

(cherry picked from commit f59ee399de4a8ca4d7d19cdcabb4b63e94867f09
https://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git

 for-5.10/upstream-fixes)

Signed-off-by: default avatarChris Ye <lzye@google.com>
Change-Id: I65742e96babc59adde0ab32656850ef4f164ac3e
parent 09b63a94

drivers/hid/hid-ids.h

+4 −0
Original line number Diff line number Diff line
@@ -449,6 +449,10 @@ 
#define USB_VENDOR_ID_FRUCTEL	0x25B6

#define USB_DEVICE_ID_GAMETEL_MT_MODE	0x0002



#define USB_VENDOR_ID_GAMEVICE	0x27F8

#define USB_DEVICE_ID_GAMEVICE_GV186	0x0BBE

#define USB_DEVICE_ID_GAMEVICE_KISHI	0x0BBF



#define USB_VENDOR_ID_GAMERON		0x0810

#define USB_DEVICE_ID_GAMERON_DUAL_PSX_ADAPTOR	0x0001

#define USB_DEVICE_ID_GAMERON_DUAL_PCS_ADAPTOR	0x0002

drivers/hid/hid-quirks.c

+4 −0
Original line number Diff line number Diff line
@@ -84,6 +84,10 @@ static const struct hid_device_id hid_quirks[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_FREESCALE, USB_DEVICE_ID_FREESCALE_MX28), HID_QUIRK_NOGET },

	{ HID_USB_DEVICE(USB_VENDOR_ID_FUTABA, USB_DEVICE_ID_LED_DISPLAY), HID_QUIRK_NO_INIT_REPORTS },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GREENASIA, USB_DEVICE_ID_GREENASIA_DUAL_USB_JOYPAD), HID_QUIRK_MULTI_INPUT },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_GAMEVICE, USB_DEVICE_ID_GAMEVICE_GV186),

		HID_QUIRK_INCREMENT_USAGE_ON_DUPLICATE },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GAMEVICE, USB_DEVICE_ID_GAMEVICE_KISHI),

		HID_QUIRK_INCREMENT_USAGE_ON_DUPLICATE },

	{ HID_USB_DEVICE(USB_VENDOR_ID_HAPP, USB_DEVICE_ID_UGCI_DRIVING), HID_QUIRK_BADPAD | HID_QUIRK_MULTI_INPUT },

	{ HID_USB_DEVICE(USB_VENDOR_ID_HAPP, USB_DEVICE_ID_UGCI_FIGHTING), HID_QUIRK_BADPAD | HID_QUIRK_MULTI_INPUT },

	{ HID_USB_DEVICE(USB_VENDOR_ID_HAPP, USB_DEVICE_ID_UGCI_FLYING), HID_QUIRK_BADPAD | HID_QUIRK_MULTI_INPUT },