diff mbox series

[v2] Input: Add devices for HID_QUIRK_INCREMENT_USAGE_ON_DUPLICATE

Message ID 20201101193452.678628-1-lzye@google.com
State New
Headers show
Series [v2] Input: Add devices for HID_QUIRK_INCREMENT_USAGE_ON_DUPLICATE | expand

Commit Message

Chris Ye Nov. 1, 2020, 7:34 p.m. UTC 
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>

---
 drivers/hid/hid-ids.h    | 4 ++++
 drivers/hid/hid-quirks.c | 4 ++++
 2 files changed, 8 insertions(+)

-- 
2.29.1.341.ge80a0c044ae-goog

Comments

Chris Ye Nov. 5, 2020, 5:04 p.m. UTC | #1 
Hi Benjamin,

     Can you review this patch?  Previously the kernel increment the HID 
usage by default,  and now in 5.4 we have to declare it explicitly 
because of this HID_QUIRK_INCREMENT_USAGE_ON_DUPLICATE. It is breaking 
existing devices functioning, including a few devices we have Android 
test with.

Thanks!

Chris

On 11/1/20 11:34 AM, Chris Ye wrote:
> 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>

> ---

>   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 74be76e848bf..cf55dca494f3 100644

> --- a/drivers/hid/hid-ids.h

> +++ b/drivers/hid/hid-ids.h

> @@ -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

> diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c

> index 0440e2f6e8a3..36d94e3485e3 100644

> --- a/drivers/hid/hid-quirks.c

> +++ b/drivers/hid/hid-quirks.c

> @@ -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 },
Chris Ye Nov. 5, 2020, 5:14 p.m. UTC | #2 
+stable@vger.kernel.org

On 11/1/20 11:34 AM, Chris Ye wrote:
> 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>

> ---

>   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 74be76e848bf..cf55dca494f3 100644

> --- a/drivers/hid/hid-ids.h

> +++ b/drivers/hid/hid-ids.h

> @@ -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

> diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c

> index 0440e2f6e8a3..36d94e3485e3 100644

> --- a/drivers/hid/hid-quirks.c

> +++ b/drivers/hid/hid-quirks.c

> @@ -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 },
Jiri Kosina Nov. 9, 2020, 11:55 a.m. UTC | #3 
On Sun, 1 Nov 2020, Chris Ye wrote:

> diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h

> index 74be76e848bf..cf55dca494f3 100644

> --- a/drivers/hid/hid-ids.h

> +++ b/drivers/hid/hid-ids.h

> @@ -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

> diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c

> index 0440e2f6e8a3..36d94e3485e3 100644

> --- a/drivers/hid/hid-quirks.c

> +++ b/drivers/hid/hid-quirks.c

> @@ -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 },


Applied for 5.10, thanks.

-- 
Jiri Kosina
SUSE Labs
Chris Ye Nov. 10, 2020, 5:52 a.m. UTC | #4 
Thanks a lot Jiri!

On 11/9/20 3:55 AM, Jiri Kosina wrote:
> On Sun, 1 Nov 2020, Chris Ye wrote:

>

>> diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h

>> index 74be76e848bf..cf55dca494f3 100644

>> --- a/drivers/hid/hid-ids.h

>> +++ b/drivers/hid/hid-ids.h

>> @@ -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

>> diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c

>> index 0440e2f6e8a3..36d94e3485e3 100644

>> --- a/drivers/hid/hid-quirks.c

>> +++ b/drivers/hid/hid-quirks.c

>> @@ -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 },

> Applied for 5.10, thanks.

>
Chris Ye Nov. 13, 2020, 5:26 p.m. UTC | #5 
Hi Jiri,  can I have a commit ID for 5.10? I'll need this to submit the 
patch internally.

Thanks!

Chris

On 11/9/20 3:55 AM, Jiri Kosina wrote:
> On Sun, 1 Nov 2020, Chris Ye wrote:

>

>> diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h

>> index 74be76e848bf..cf55dca494f3 100644

>> --- a/drivers/hid/hid-ids.h

>> +++ b/drivers/hid/hid-ids.h

>> @@ -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

>> diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c

>> index 0440e2f6e8a3..36d94e3485e3 100644

>> --- a/drivers/hid/hid-quirks.c

>> +++ b/drivers/hid/hid-quirks.c

>> @@ -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 },

> Applied for 5.10, thanks.

>
Michael Wright Nov. 13, 2020, 5:43 p.m. UTC | #6 
Hi Chris,

I believe the patch is applied to the HID tree:
https://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git/commit/?h=for-5.10/upstream-fixes&id=f59ee399de4a8ca4d7d19cdcabb4b63e94867f09

If so, the commit SHA is f59ee399de4a8ca4d7d19cdcabb4b63e94867f09.

Hope this helps,
Michael


On Fri, Nov 13, 2020 at 5:27 PM Chris Ye <linzhao.ye@gmail.com> wrote:
>

> Hi Jiri,  can I have a commit ID for 5.10? I'll need this to submit the

> patch internally.

>

> Thanks!

>

> Chris

>

> On 11/9/20 3:55 AM, Jiri Kosina wrote:

> > On Sun, 1 Nov 2020, Chris Ye wrote:

> >

> >> diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h

> >> index 74be76e848bf..cf55dca494f3 100644

> >> --- a/drivers/hid/hid-ids.h

> >> +++ b/drivers/hid/hid-ids.h

> >> @@ -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

> >> diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c

> >> index 0440e2f6e8a3..36d94e3485e3 100644

> >> --- a/drivers/hid/hid-quirks.c

> >> +++ b/drivers/hid/hid-quirks.c

> >> @@ -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 },

> > Applied for 5.10, thanks.

> >
Chris Ye Nov. 13, 2020, 5:45 p.m. UTC | #7 
Great, thanks a lot Michael!

On 11/13/20 9:43 AM, Michael Wright wrote:
> Hi Chris,

>

> I believe the patch is applied to the HID tree:

> https://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git/commit/?h=for-5.10/upstream-fixes&id=f59ee399de4a8ca4d7d19cdcabb4b63e94867f09

>

> If so, the commit SHA is f59ee399de4a8ca4d7d19cdcabb4b63e94867f09.

>

> Hope this helps,

> Michael

>

>

> On Fri, Nov 13, 2020 at 5:27 PM Chris Ye <linzhao.ye@gmail.com> wrote:

>> Hi Jiri,  can I have a commit ID for 5.10? I'll need this to submit the

>> patch internally.

>>

>> Thanks!

>>

>> Chris

>>

>> On 11/9/20 3:55 AM, Jiri Kosina wrote:

>>> On Sun, 1 Nov 2020, Chris Ye wrote:

>>>

>>>> diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h

>>>> index 74be76e848bf..cf55dca494f3 100644

>>>> --- a/drivers/hid/hid-ids.h

>>>> +++ b/drivers/hid/hid-ids.h

>>>> @@ -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

>>>> diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c

>>>> index 0440e2f6e8a3..36d94e3485e3 100644

>>>> --- a/drivers/hid/hid-quirks.c

>>>> +++ b/drivers/hid/hid-quirks.c

>>>> @@ -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 },

>>> Applied for 5.10, thanks.

>>>
diff mbox series

Patch

diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 74be76e848bf..cf55dca494f3 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -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
diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c
index 0440e2f6e8a3..36d94e3485e3 100644
--- a/drivers/hid/hid-quirks.c
+++ b/drivers/hid/hid-quirks.c
@@ -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 },