| From 30dd52358dec8d10c06124ac64cee793a383ad55 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Sun, 1 Nov 2020 11:34:52 -0800 |
| Subject: HID: add HID_QUIRK_INCREMENT_USAGE_ON_DUPLICATE for Gamevice devices |
| |
| From: Chris Ye <lzye@google.com> |
| |
| [ Upstream commit f59ee399de4a8ca4d7d19cdcabb4b63e94867f09 ] |
| |
| Kernel 5.4 introduces HID_QUIRK_INCREMENT_USAGE_ON_DUPLICATE, devices need to |
| be set explicitly with this flag. |
| |
| Signed-off-by: Chris Ye <lzye@google.com> |
| Signed-off-by: Jiri Kosina <jkosina@suse.cz> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/hid/hid-ids.h | 4 ++++ |
| drivers/hid/hid-quirks.c | 4 ++++ |
| 2 files changed, 8 insertions(+) |
| |
| diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h |
| index d173badafcf1f..6b1c26e6fa4a3 100644 |
| --- a/drivers/hid/hid-ids.h |
| +++ b/drivers/hid/hid-ids.h |
| @@ -451,6 +451,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 |
| diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c |
| index abee4e950a4ee..60d188a704e5e 100644 |
| --- a/drivers/hid/hid-quirks.c |
| +++ b/drivers/hid/hid-quirks.c |
| @@ -85,6 +85,10 @@ static const struct hid_device_id hid_quirks[] = { |
| { 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_SAT_ADAPTOR), HID_QUIRK_MULTI_INPUT }, |
| { 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 }, |
| -- |
| 2.27.0 |
| |