diff mbox series

HID: cougar: Add support for Cougar 700K Gaming Keyboard

Message ID 20181118144255.8507-1-dmlambea@gmail.com (mailing list archive)
State Mainlined
Commit aeed35faee5261e6e93d51192923b7a7c3c4dab5
Delegated to: Jiri Kosina
Headers show
Series HID: cougar: Add support for Cougar 700K Gaming Keyboard | expand

Commit Message

Daniel M. Lambea Nov. 18, 2018, 2:42 p.m. UTC
Add USB ID 060b:700a to the list of valid USB IDS for the
cougar hid driver.

Signed-off-by: Daniel M. Lambea <dmlambea@gmail.com>
---
 drivers/hid/hid-cougar.c | 2 ++
 drivers/hid/hid-ids.h    | 1 +
 2 files changed, 3 insertions(+)

Comments

Benjamin Tissoires Nov. 21, 2018, 10:17 a.m. UTC | #1
Hi Daniel,

On Sun, Nov 18, 2018 at 3:43 PM Daniel M. Lambea <dmlambea@gmail.com> wrote:
>
> Add USB ID 060b:700a to the list of valid USB IDS for the
> cougar hid driver.

Just a question so I know where to apply this.
Does the keyboard works fine currently and is just missing a few extra
features or the switch to hid-cougar is definitively required?

Cheers,
Benjamin

>
> Signed-off-by: Daniel M. Lambea <dmlambea@gmail.com>
> ---
>  drivers/hid/hid-cougar.c | 2 ++
>  drivers/hid/hid-ids.h    | 1 +
>  2 files changed, 3 insertions(+)
>
> diff --git a/drivers/hid/hid-cougar.c b/drivers/hid/hid-cougar.c
> index 3f0916b64c60..e0bb7b34f3a4 100644
> --- a/drivers/hid/hid-cougar.c
> +++ b/drivers/hid/hid-cougar.c
> @@ -326,6 +326,8 @@ module_param_cb(g6_is_space, &cougar_g6_is_space_ops, &g6_is_space, 0644);
>  static struct hid_device_id cougar_id_table[] = {
>         { HID_USB_DEVICE(USB_VENDOR_ID_SOLID_YEAR,
>                          USB_DEVICE_ID_COUGAR_500K_GAMING_KEYBOARD) },
> +       { HID_USB_DEVICE(USB_VENDOR_ID_SOLID_YEAR,
> +                        USB_DEVICE_ID_COUGAR_700K_GAMING_KEYBOARD) },
>         {}
>  };
>  MODULE_DEVICE_TABLE(hid, cougar_id_table);
> diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
> index f63489c882bb..69ccda9280d9 100644
> --- a/drivers/hid/hid-ids.h
> +++ b/drivers/hid/hid-ids.h
> @@ -1010,6 +1010,7 @@
>
>  #define USB_VENDOR_ID_SOLID_YEAR                       0x060b
>  #define USB_DEVICE_ID_COUGAR_500K_GAMING_KEYBOARD      0x500a
> +#define USB_DEVICE_ID_COUGAR_700K_GAMING_KEYBOARD      0x700a
>
>  #define USB_VENDOR_ID_SOUNDGRAPH       0x15c2
>  #define USB_DEVICE_ID_SOUNDGRAPH_IMON_FIRST    0x0034
> --
> 2.17.1
>
Benjamin Tissoires Nov. 21, 2018, 10:49 a.m. UTC | #2
On Wed, Nov 21, 2018 at 11:40 AM Daniel M. Lambea <dmlambea@gmail.com> wrote:
>
>
>
> El mié., 21 nov. 2018 10:17, Benjamin Tissoires <benjamin.tissoires@redhat.com> escribió:
>>
>> Hi Daniel,
>>
>> On Sun, Nov 18, 2018 at 3:43 PM Daniel M. Lambea <dmlambea@gmail.com> wrote:
>> >
>> > Add USB ID 060b:700a to the list of valid USB IDS for the
>> > cougar hid driver.
>>
>> Just a question so I know where to apply this.
>> Does the keyboard works fine currently and is just missing a few extra
>> features or the switch to hid-cougar is definitively required?
>
>
> The driver is working fine but since it is only targeting the 500K model, other models are not being supported. It seems that model 700K is compatible with current hid-cougar, so adding its USB ID to the driver's list of supported devices will make it work.

My question is more about the current status of the keyboard with
hid-generic in 4.19.
I get that the keyboard works fine with hid-cougar, it's just to know
if I need to send this to Linus ASAP and CC stable@ or if this can
wait 4.21.

Cheers,
Benjamin

>
>> Cheers,
>> Benjamin
>>
>> >
>> > Signed-off-by: Daniel M. Lambea <dmlambea@gmail.com>
>> > ---
>> >  drivers/hid/hid-cougar.c | 2 ++
>> >  drivers/hid/hid-ids.h    | 1 +
>> >  2 files changed, 3 insertions(+)
>> >
>> > diff --git a/drivers/hid/hid-cougar.c b/drivers/hid/hid-cougar.c
>> > index 3f0916b64c60..e0bb7b34f3a4 100644
>> > --- a/drivers/hid/hid-cougar.c
>> > +++ b/drivers/hid/hid-cougar.c
>> > @@ -326,6 +326,8 @@ module_param_cb(g6_is_space, &cougar_g6_is_space_ops, &g6_is_space, 0644);
>> >  static struct hid_device_id cougar_id_table[] = {
>> >         { HID_USB_DEVICE(USB_VENDOR_ID_SOLID_YEAR,
>> >                          USB_DEVICE_ID_COUGAR_500K_GAMING_KEYBOARD) },
>> > +       { HID_USB_DEVICE(USB_VENDOR_ID_SOLID_YEAR,
>> > +                        USB_DEVICE_ID_COUGAR_700K_GAMING_KEYBOARD) },
>> >         {}
>> >  };
>> >  MODULE_DEVICE_TABLE(hid, cougar_id_table);
>> > diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
>> > index f63489c882bb..69ccda9280d9 100644
>> > --- a/drivers/hid/hid-ids.h
>> > +++ b/drivers/hid/hid-ids.h
>> > @@ -1010,6 +1010,7 @@
>> >
>> >  #define USB_VENDOR_ID_SOLID_YEAR                       0x060b
>> >  #define USB_DEVICE_ID_COUGAR_500K_GAMING_KEYBOARD      0x500a
>> > +#define USB_DEVICE_ID_COUGAR_700K_GAMING_KEYBOARD      0x700a
>> >
>> >  #define USB_VENDOR_ID_SOUNDGRAPH       0x15c2
>> >  #define USB_DEVICE_ID_SOUNDGRAPH_IMON_FIRST    0x0034
>> > --
>> > 2.17.1
>> >
Benjamin Tissoires Nov. 21, 2018, 10:53 a.m. UTC | #3
On Wed, Nov 21, 2018 at 11:52 AM Daniel M. Lambea <dmlambea@gmail.com> wrote:
>
>
>
> El mié., 21 nov. 2018 10:49, Benjamin Tissoires <benjamin.tissoires@redhat.com> escribió:
>>
>> On Wed, Nov 21, 2018 at 11:40 AM Daniel M. Lambea <dmlambea@gmail.com> wrote:
>> >
>> >
>> >
>> > El mié., 21 nov. 2018 10:17, Benjamin Tissoires <benjamin.tissoires@redhat.com> escribió:
>> >>
>> >> Hi Daniel,
>> >>
>> >> On Sun, Nov 18, 2018 at 3:43 PM Daniel M. Lambea <dmlambea@gmail.com> wrote:
>> >> >
>> >> > Add USB ID 060b:700a to the list of valid USB IDS for the
>> >> > cougar hid driver.
>> >>
>> >> Just a question so I know where to apply this.
>> >> Does the keyboard works fine currently and is just missing a few extra
>> >> features or the switch to hid-cougar is definitively required?
>> >
>> >
>> > The driver is working fine but since it is only targeting the 500K model, other models are not being supported. It seems that model 700K is compatible with current hid-cougar, so adding its USB ID to the driver's list of supported devices will make it work.
>>
>> My question is more about the current status of the keyboard with
>> hid-generic in 4.19.
>> I get that the keyboard works fine with hid-cougar, it's just to know
>> if I need to send this to Linus ASAP and CC stable@ or if this can
>> wait 4.21.
>
>
> Oh, I see, sorry. It is not urgent, it just adds support for another model. I think it can wait for 4.21

Heh. Thanks for the quick answers. I'll apply it ASAP so it gets out
of our patch queues.

Cheers,
Benjamin

>
> Cheers!
>
>> Cheers,
>> Benjamin
>>
>> >
>> >> Cheers,
>> >> Benjamin
>> >>
>> >> >
>> >> > Signed-off-by: Daniel M. Lambea <dmlambea@gmail.com>
>> >> > ---
>> >> >  drivers/hid/hid-cougar.c | 2 ++
>> >> >  drivers/hid/hid-ids.h    | 1 +
>> >> >  2 files changed, 3 insertions(+)
>> >> >
>> >> > diff --git a/drivers/hid/hid-cougar.c b/drivers/hid/hid-cougar.c
>> >> > index 3f0916b64c60..e0bb7b34f3a4 100644
>> >> > --- a/drivers/hid/hid-cougar.c
>> >> > +++ b/drivers/hid/hid-cougar.c
>> >> > @@ -326,6 +326,8 @@ module_param_cb(g6_is_space, &cougar_g6_is_space_ops, &g6_is_space, 0644);
>> >> >  static struct hid_device_id cougar_id_table[] = {
>> >> >         { HID_USB_DEVICE(USB_VENDOR_ID_SOLID_YEAR,
>> >> >                          USB_DEVICE_ID_COUGAR_500K_GAMING_KEYBOARD) },
>> >> > +       { HID_USB_DEVICE(USB_VENDOR_ID_SOLID_YEAR,
>> >> > +                        USB_DEVICE_ID_COUGAR_700K_GAMING_KEYBOARD) },
>> >> >         {}
>> >> >  };
>> >> >  MODULE_DEVICE_TABLE(hid, cougar_id_table);
>> >> > diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
>> >> > index f63489c882bb..69ccda9280d9 100644
>> >> > --- a/drivers/hid/hid-ids.h
>> >> > +++ b/drivers/hid/hid-ids.h
>> >> > @@ -1010,6 +1010,7 @@
>> >> >
>> >> >  #define USB_VENDOR_ID_SOLID_YEAR                       0x060b
>> >> >  #define USB_DEVICE_ID_COUGAR_500K_GAMING_KEYBOARD      0x500a
>> >> > +#define USB_DEVICE_ID_COUGAR_700K_GAMING_KEYBOARD      0x700a
>> >> >
>> >> >  #define USB_VENDOR_ID_SOUNDGRAPH       0x15c2
>> >> >  #define USB_DEVICE_ID_SOUNDGRAPH_IMON_FIRST    0x0034
>> >> > --
>> >> > 2.17.1
>> >> >
Benjamin Tissoires Nov. 21, 2018, 3:17 p.m. UTC | #4
On Sun, Nov 18, 2018 at 3:43 PM Daniel M. Lambea <dmlambea@gmail.com> wrote:
>
> Add USB ID 060b:700a to the list of valid USB IDS for the
> cougar hid driver.
>
> Signed-off-by: Daniel M. Lambea <dmlambea@gmail.com>
> ---

Applied to for-4.21/hid-cougar

Thanks

>  drivers/hid/hid-cougar.c | 2 ++
>  drivers/hid/hid-ids.h    | 1 +
>  2 files changed, 3 insertions(+)
>
> diff --git a/drivers/hid/hid-cougar.c b/drivers/hid/hid-cougar.c
> index 3f0916b64c60..e0bb7b34f3a4 100644
> --- a/drivers/hid/hid-cougar.c
> +++ b/drivers/hid/hid-cougar.c
> @@ -326,6 +326,8 @@ module_param_cb(g6_is_space, &cougar_g6_is_space_ops, &g6_is_space, 0644);
>  static struct hid_device_id cougar_id_table[] = {
>         { HID_USB_DEVICE(USB_VENDOR_ID_SOLID_YEAR,
>                          USB_DEVICE_ID_COUGAR_500K_GAMING_KEYBOARD) },
> +       { HID_USB_DEVICE(USB_VENDOR_ID_SOLID_YEAR,
> +                        USB_DEVICE_ID_COUGAR_700K_GAMING_KEYBOARD) },
>         {}
>  };
>  MODULE_DEVICE_TABLE(hid, cougar_id_table);
> diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
> index f63489c882bb..69ccda9280d9 100644
> --- a/drivers/hid/hid-ids.h
> +++ b/drivers/hid/hid-ids.h
> @@ -1010,6 +1010,7 @@
>
>  #define USB_VENDOR_ID_SOLID_YEAR                       0x060b
>  #define USB_DEVICE_ID_COUGAR_500K_GAMING_KEYBOARD      0x500a
> +#define USB_DEVICE_ID_COUGAR_700K_GAMING_KEYBOARD      0x700a
>
>  #define USB_VENDOR_ID_SOUNDGRAPH       0x15c2
>  #define USB_DEVICE_ID_SOUNDGRAPH_IMON_FIRST    0x0034
> --
> 2.17.1
>
diff mbox series

Patch

diff --git a/drivers/hid/hid-cougar.c b/drivers/hid/hid-cougar.c
index 3f0916b64c60..e0bb7b34f3a4 100644
--- a/drivers/hid/hid-cougar.c
+++ b/drivers/hid/hid-cougar.c
@@ -326,6 +326,8 @@  module_param_cb(g6_is_space, &cougar_g6_is_space_ops, &g6_is_space, 0644);
 static struct hid_device_id cougar_id_table[] = {
 	{ HID_USB_DEVICE(USB_VENDOR_ID_SOLID_YEAR,
 			 USB_DEVICE_ID_COUGAR_500K_GAMING_KEYBOARD) },
+	{ HID_USB_DEVICE(USB_VENDOR_ID_SOLID_YEAR,
+			 USB_DEVICE_ID_COUGAR_700K_GAMING_KEYBOARD) },
 	{}
 };
 MODULE_DEVICE_TABLE(hid, cougar_id_table);
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index f63489c882bb..69ccda9280d9 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -1010,6 +1010,7 @@ 
 
 #define USB_VENDOR_ID_SOLID_YEAR			0x060b
 #define USB_DEVICE_ID_COUGAR_500K_GAMING_KEYBOARD	0x500a
+#define USB_DEVICE_ID_COUGAR_700K_GAMING_KEYBOARD	0x700a
 
 #define USB_VENDOR_ID_SOUNDGRAPH	0x15c2
 #define USB_DEVICE_ID_SOUNDGRAPH_IMON_FIRST	0x0034