aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Duggan <aduggan@synaptics.com>2015-01-08 17:51:35 -0500
committerJiri Kosina <jkosina@suse.cz>2015-01-12 04:12:00 -0500
commite9287099ba6539bccb20cd791269186f3ae28b85 (patch)
tree9b79f9bbaf1ae7527ef17e931d9993665b2c589c
parent79364d87af239e2029aeba3b82bd79c355b9bb86 (diff)
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 <aduggan@synaptics.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
-rw-r--r--drivers/hid/hid-core.c1
-rw-r--r--drivers/hid/hid-ids.h3
-rw-r--r--drivers/hid/hid-rmi.c2
3 files changed, 6 insertions, 0 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index 81665b4f2258..ef718f94e7ce 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1982,6 +1982,7 @@ static const struct hid_device_id hid_have_special_driver[] = {
1982 { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_BT) }, 1982 { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_BT) },
1983 { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_NINTENDO, USB_DEVICE_ID_NINTENDO_WIIMOTE) }, 1983 { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_NINTENDO, USB_DEVICE_ID_NINTENDO_WIIMOTE) },
1984 { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_NINTENDO, USB_DEVICE_ID_NINTENDO_WIIMOTE2) }, 1984 { 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) },
1985 { } 1986 { }
1986}; 1987};
1987 1988
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 7460f3402298..7d0912db3ca9 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -767,6 +767,9 @@
767#define USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3001 0x3001 767#define USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3001 0x3001
768#define USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3008 0x3008 768#define USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3008 0x3008
769 769
770#define USB_VENDOR_ID_RAZER 0x1532
771#define USB_DEVICE_ID_RAZER_BLADE_14 0x011D
772
770#define USB_VENDOR_ID_REALTEK 0x0bda 773#define USB_VENDOR_ID_REALTEK 0x0bda
771#define USB_DEVICE_ID_REALTEK_READER 0x0152 774#define USB_DEVICE_ID_REALTEK_READER 0x0152
772 775
diff --git a/drivers/hid/hid-rmi.c b/drivers/hid/hid-rmi.c
index 4bf43c82fa67..49d4fe4f5987 100644
--- a/drivers/hid/hid-rmi.c
+++ b/drivers/hid/hid-rmi.c
@@ -1082,6 +1082,8 @@ static void rmi_remove(struct hid_device *hdev)
1082} 1082}
1083 1083
1084static const struct hid_device_id rmi_id[] = { 1084static 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 },
1085 { HID_DEVICE(HID_BUS_ANY, HID_GROUP_RMI, HID_ANY_ID, HID_ANY_ID) }, 1087 { HID_DEVICE(HID_BUS_ANY, HID_GROUP_RMI, HID_ANY_ID, HID_ANY_ID) },
1086 { } 1088 { }
1087}; 1089};