Re: [PATCH v2] hid-logitech-dj: add the new Lightspeed receiver

[Benjamin Tissoires]

On Tue, Jul 30, 2019 at 2:26 PM Filipe LaÃns <lains@xxxxxxxxxxxxx> wrote:
>
> This patchs adds the new Lightspeed receiver. Currently it seems to only
> be used in the G305.
>
> Signed-off-by: Filipe LaÃns <lains@xxxxxxxxxxxxx>

Applied to for-5.4/logitech

Cheers,
Benjamin

> ---
>  drivers/hid/hid-ids.h         |  3 ++-
>  drivers/hid/hid-logitech-dj.c | 13 +++++++++++--
>  2 files changed, 13 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
> index fb19eefbc0b3..61b954fcfc2e 100644
> --- a/drivers/hid/hid-ids.h
> +++ b/drivers/hid/hid-ids.h
> @@ -768,7 +768,8 @@
>  #define USB_DEVICE_ID_LOGITECH_NANO_RECEIVER           0xc52f
>  #define USB_DEVICE_ID_LOGITECH_UNIFYING_RECEIVER_2     0xc532
>  #define USB_DEVICE_ID_LOGITECH_NANO_RECEIVER_2         0xc534
> -#define USB_DEVICE_ID_LOGITECH_NANO_RECEIVER_LIGHTSPEED        0xc539
> +#define USB_DEVICE_ID_LOGITECH_NANO_RECEIVER_LIGHTSPEED_1      0xc539
> +#define USB_DEVICE_ID_LOGITECH_NANO_RECEIVER_LIGHTSPEED_1_1    0xc53f
>  #define USB_DEVICE_ID_LOGITECH_NANO_RECEIVER_POWERPLAY 0xc53a
>  #define USB_DEVICE_ID_SPACETRAVELLER   0xc623
>  #define USB_DEVICE_ID_SPACENAVIGATOR   0xc626
> diff --git a/drivers/hid/hid-logitech-dj.c b/drivers/hid/hid-logitech-dj.c
> index 4a68960b131f..d718f01f56d3 100644
> --- a/drivers/hid/hid-logitech-dj.c
> +++ b/drivers/hid/hid-logitech-dj.c
> @@ -968,7 +968,12 @@ static void logi_hidpp_recv_queue_notif(struct hid_device *hdev,
>                 logi_hidpp_dev_conn_notif_equad(hdev, hidpp_report, &workitem);
>                 break;
>         case 0x0c:
> -               device_type = "eQUAD Lightspeed";
> +               device_type = "eQUAD Lightspeed 1";
> +               logi_hidpp_dev_conn_notif_equad(hdev, hidpp_report, &workitem);
> +               workitem.reports_supported |= STD_KEYBOARD;
> +               break;
> +       case 0x0d:
> +               device_type = "eQUAD Lightspeed 1_1";
>                 logi_hidpp_dev_conn_notif_equad(hdev, hidpp_report, &workitem);
>                 workitem.reports_supported |= STD_KEYBOARD;
>                 break;
> @@ -1832,7 +1837,11 @@ static const struct hid_device_id logi_dj_receivers[] = {
>          .driver_data = recvr_type_hidpp},
>         { /* Logitech lightspeed receiver (0xc539) */
>           HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH,
> -               USB_DEVICE_ID_LOGITECH_NANO_RECEIVER_LIGHTSPEED),
> +               USB_DEVICE_ID_LOGITECH_NANO_RECEIVER_LIGHTSPEED_1),
> +        .driver_data = recvr_type_gaming_hidpp},
> +       { /* Logitech lightspeed receiver (0xc53f) */
> +         HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH,
> +               USB_DEVICE_ID_LOGITECH_NANO_RECEIVER_LIGHTSPEED_1_1),
>          .driver_data = recvr_type_gaming_hidpp},
>         { /* Logitech 27 MHz HID++ 1.0 receiver (0xc513) */
>           HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_MX3000_RECEIVER),
> --
> 2.22.0