aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Duggan <aduggan@synaptics.com>2017-11-17 20:21:30 -0500
committerJiri Kosina <jkosina@suse.cz>2018-01-23 09:20:40 -0500
commitc5293409e13729fb0dcf38d131ead332b465d2c7 (patch)
treef83737803f18cdee1292790b256bd033936acae1
parent332347d4c7a1353cc0aa9a3f0cd238d36ce0d932 (diff)
HID: rmi: Support the Fujitsu R726 Pad dock using hid-rmi
The Fujitsu R726 Pad has an optional USB keyboard dock which contains a Synaptics touchpad. The dock identifies itself as a Primax Rezel Tablet Keyboard. Signed-off-by: Andrew Duggan <aduggan@synaptics.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
-rw-r--r--drivers/hid/hid-ids.h1
-rw-r--r--drivers/hid/hid-quirks.c1
-rw-r--r--drivers/hid/hid-rmi.c1
3 files changed, 3 insertions, 0 deletions
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 5da3d6256d25..93452a1f26ee 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -1156,6 +1156,7 @@
1156#define USB_VENDOR_ID_PRIMAX 0x0461 1156#define USB_VENDOR_ID_PRIMAX 0x0461
1157#define USB_DEVICE_ID_PRIMAX_MOUSE_4D22 0x4d22 1157#define USB_DEVICE_ID_PRIMAX_MOUSE_4D22 0x4d22
1158#define USB_DEVICE_ID_PRIMAX_KEYBOARD 0x4e05 1158#define USB_DEVICE_ID_PRIMAX_KEYBOARD 0x4e05
1159#define USB_DEVICE_ID_PRIMAX_REZEL 0x4e72
1159 1160
1160 1161
1161#define USB_VENDOR_ID_RISO_KAGAKU 0x1294 /* Riso Kagaku Corp. */ 1162#define USB_VENDOR_ID_RISO_KAGAKU 0x1294 /* Riso Kagaku Corp. */
diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c
index 20e68a7ac79f..273f7cde6e60 100644
--- a/drivers/hid/hid-quirks.c
+++ b/drivers/hid/hid-quirks.c
@@ -561,6 +561,7 @@ static const struct hid_device_id hid_have_special_driver[] = {
561#if IS_ENABLED(CONFIG_HID_RMI) 561#if IS_ENABLED(CONFIG_HID_RMI)
562 { HID_USB_DEVICE(USB_VENDOR_ID_LENOVO, USB_DEVICE_ID_LENOVO_X1_COVER) }, 562 { HID_USB_DEVICE(USB_VENDOR_ID_LENOVO, USB_DEVICE_ID_LENOVO_X1_COVER) },
563 { HID_USB_DEVICE(USB_VENDOR_ID_RAZER, USB_DEVICE_ID_RAZER_BLADE_14) }, 563 { HID_USB_DEVICE(USB_VENDOR_ID_RAZER, USB_DEVICE_ID_RAZER_BLADE_14) },
564 { HID_USB_DEVICE(USB_VENDOR_ID_PRIMAX, USB_DEVICE_ID_PRIMAX_REZEL) },
564#endif 565#endif
565#if IS_ENABLED(CONFIG_HID_ROCCAT) 566#if IS_ENABLED(CONFIG_HID_ROCCAT)
566 { HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_ARVO) }, 567 { HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_ARVO) },
diff --git a/drivers/hid/hid-rmi.c b/drivers/hid/hid-rmi.c
index 0f43c4292685..c6c05df3e8d2 100644
--- a/drivers/hid/hid-rmi.c
+++ b/drivers/hid/hid-rmi.c
@@ -731,6 +731,7 @@ static const struct hid_device_id rmi_id[] = {
731 { HID_USB_DEVICE(USB_VENDOR_ID_RAZER, USB_DEVICE_ID_RAZER_BLADE_14), 731 { HID_USB_DEVICE(USB_VENDOR_ID_RAZER, USB_DEVICE_ID_RAZER_BLADE_14),
732 .driver_data = RMI_DEVICE_HAS_PHYS_BUTTONS }, 732 .driver_data = RMI_DEVICE_HAS_PHYS_BUTTONS },
733 { HID_USB_DEVICE(USB_VENDOR_ID_LENOVO, USB_DEVICE_ID_LENOVO_X1_COVER) }, 733 { HID_USB_DEVICE(USB_VENDOR_ID_LENOVO, USB_DEVICE_ID_LENOVO_X1_COVER) },
734 { HID_USB_DEVICE(USB_VENDOR_ID_PRIMAX, USB_DEVICE_ID_PRIMAX_REZEL) },
734 { HID_DEVICE(HID_BUS_ANY, HID_GROUP_RMI, HID_ANY_ID, HID_ANY_ID) }, 735 { HID_DEVICE(HID_BUS_ANY, HID_GROUP_RMI, HID_ANY_ID, HID_ANY_ID) },
735 { } 736 { }
736}; 737};