Merge tag 'amlogic-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman...

[linux.git] / drivers / hid / hid-logitech-hidpp.c

diff --git a/drivers/hid/hid-logitech-hidpp.c b/drivers/hid/hid-logitech-hidpp.c
index 72fc9c0566dbb34795fd803dca0631ad6972c9dc..cf05816a601f5252e7c1308f13334e3d2a554572 100644 (file)
--- a/drivers/hid/hid-logitech-hidpp.c
+++ b/drivers/hid/hid-logitech-hidpp.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  *  HIDPP protocol for Logitech Unifying receivers
  *
@@ -6,11 +7,6 @@
  *  Copyright (c) 2013-2014 Red Hat Inc.
  */
 
-/*
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; version 2 of the License.
- */
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
@@ -3732,6 +3728,9 @@ static const struct hid_device_id hidpp_devices[] = {
        { /* Keyboard MX5000 (Bluetooth-receiver in HID proxy mode) */
          LDJ_DEVICE(0xb305),
          .driver_data = HIDPP_QUIRK_HIDPP_CONSUMER_VENDOR_KEYS },
+       { /* Keyboard MX5500 (Bluetooth-receiver in HID proxy mode) */
+         LDJ_DEVICE(0xb30b),
+         .driver_data = HIDPP_QUIRK_HIDPP_CONSUMER_VENDOR_KEYS },
 
        { LDJ_DEVICE(HID_ANY_ID) },
 
@@ -3744,6 +3743,9 @@ static const struct hid_device_id hidpp_devices[] = {
        { /* Keyboard MX3200 (Y-RAV80) */
          L27MHZ_DEVICE(0x005c),
          .driver_data = HIDPP_QUIRK_KBD_ZOOM_WHEEL },
+       { /* S510 Media Remote */
+         L27MHZ_DEVICE(0x00fe),
+         .driver_data = HIDPP_QUIRK_KBD_SCROLL_WHEEL },
 
        { L27MHZ_DEVICE(HID_ANY_ID) },
 
@@ -3760,6 +3762,9 @@ static const struct hid_device_id hidpp_devices[] = {
        { /* MX5000 keyboard over Bluetooth */
          HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_LOGITECH, 0xb305),
          .driver_data = HIDPP_QUIRK_HIDPP_CONSUMER_VENDOR_KEYS },
+       { /* MX5500 keyboard over Bluetooth */
+         HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_LOGITECH, 0xb30b),
+         .driver_data = HIDPP_QUIRK_HIDPP_CONSUMER_VENDOR_KEYS },
        {}
 };