Skip to content

Commit e928709

Browse files
aduggan-synaJiri Kosina
authored andcommitted
HID: rmi: Add support for the touchpad in the Razer Blade 14 laptop
Have hid-rmi handle all of the Razer Blade HID devices that are part of the composite USB device. This will allow hid-rmi to operate the touchpad in rmi mode while passing events from the other devices to hid-input. Signed-off-by: Andrew Duggan <[email protected]> Signed-off-by: Jiri Kosina <[email protected]>
1 parent 79364d8 commit e928709

File tree

3 files changed

+6
-0
lines changed

3 files changed

+6
-0
lines changed

drivers/hid/hid-core.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1982,6 +1982,7 @@ static const struct hid_device_id hid_have_special_driver[] = {
19821982
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_BT) },
19831983
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_NINTENDO, USB_DEVICE_ID_NINTENDO_WIIMOTE) },
19841984
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_NINTENDO, USB_DEVICE_ID_NINTENDO_WIIMOTE2) },
1985+
{ HID_USB_DEVICE(USB_VENDOR_ID_RAZER, USB_DEVICE_ID_RAZER_BLADE_14) },
19851986
{ }
19861987
};
19871988

drivers/hid/hid-ids.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -767,6 +767,9 @@
767767
#define USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3001 0x3001
768768
#define USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3008 0x3008
769769

770+
#define USB_VENDOR_ID_RAZER 0x1532
771+
#define USB_DEVICE_ID_RAZER_BLADE_14 0x011D
772+
770773
#define USB_VENDOR_ID_REALTEK 0x0bda
771774
#define USB_DEVICE_ID_REALTEK_READER 0x0152
772775

drivers/hid/hid-rmi.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1082,6 +1082,8 @@ static void rmi_remove(struct hid_device *hdev)
10821082
}
10831083

10841084
static const struct hid_device_id rmi_id[] = {
1085+
{ HID_USB_DEVICE(USB_VENDOR_ID_RAZER, USB_DEVICE_ID_RAZER_BLADE_14),
1086+
.driver_data = RMI_DEVICE_HAS_PHYS_BUTTONS },
10851087
{ HID_DEVICE(HID_BUS_ANY, HID_GROUP_RMI, HID_ANY_ID, HID_ANY_ID) },
10861088
{ }
10871089
};

0 commit comments

Comments
 (0)