lkml.org 
[lkml]   [2020]   [Jun]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.6 105/606] HID: logitech: Add support for Logitech G11 extra keys
    Date
    From: Fabian Schindlatz <fabian.schindlatz@fau.de>

    [ Upstream commit b1bd0f75288f60e8d142a1b3e979ed0192c04931 ]

    The Logitech G11 keyboard is a cheap variant of the G15 without the LCD
    screen. It uses the same layout for its extra and macro keys (G1 - G18,
    M1-M3, MR) and - from the input subsystem's perspective - behaves just
    like the G15, so we can treat it as such.

    Tested it with my own keyboard.

    Signed-off-by: Fabian Schindlatz <fabian.schindlatz@fau.de>
    Reviewed-by: Hans de Goede <hdegoede@redhat.com>
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/hid/hid-ids.h | 1 +
    drivers/hid/hid-lg-g15.c | 4 ++++
    2 files changed, 5 insertions(+)

    diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
    index 309510a72c5e..40697af0ca35 100644
    --- a/drivers/hid/hid-ids.h
    +++ b/drivers/hid/hid-ids.h
    @@ -756,6 +756,7 @@
    #define USB_DEVICE_ID_LOGITECH_RUMBLEPAD2 0xc218
    #define USB_DEVICE_ID_LOGITECH_RUMBLEPAD2_2 0xc219
    #define USB_DEVICE_ID_LOGITECH_G15_LCD 0xc222
    +#define USB_DEVICE_ID_LOGITECH_G11 0xc225
    #define USB_DEVICE_ID_LOGITECH_G15_V2_LCD 0xc227
    #define USB_DEVICE_ID_LOGITECH_G510 0xc22d
    #define USB_DEVICE_ID_LOGITECH_G510_USB_AUDIO 0xc22e
    diff --git a/drivers/hid/hid-lg-g15.c b/drivers/hid/hid-lg-g15.c
    index ad4b5412a9f4..ef0cbcd7540d 100644
    --- a/drivers/hid/hid-lg-g15.c
    +++ b/drivers/hid/hid-lg-g15.c
    @@ -872,6 +872,10 @@ static int lg_g15_probe(struct hid_device *hdev, const struct hid_device_id *id)
    }

    static const struct hid_device_id lg_g15_devices[] = {
    + /* The G11 is a G15 without the LCD, treat it as a G15 */
    + { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH,
    + USB_DEVICE_ID_LOGITECH_G11),
    + .driver_data = LG_G15 },
    { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH,
    USB_DEVICE_ID_LOGITECH_G15_LCD),
    .driver_data = LG_G15 },
    --
    2.25.1
    \
     
     \ /
      Last update: 2020-06-09 02:36    [W:4.115 / U:0.240 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site