diff options
author | Shrirang Bagul <shrirang.bagul@canonical.com> | 2017-08-10 05:54:01 -0400 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2017-09-06 05:05:34 -0400 |
commit | fcaa4a07d2a4b541e91da7a55d8b3331f96d1865 (patch) | |
tree | 366d9ed0bec9b9b83eaba50af449a259fef01570 | |
parent | 56d859e11aad4016e1cf864d65a0954d83120571 (diff) |
HID: multitouch: Support ALPS PTP stick with pid 0x120A
This patch adds ALPS PTP sticks with pid/device id 0x120A to the list of
devices supported by hid-multitouch.
Signed-off-by: Shrirang Bagul <shrirang.bagul@canonical.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
-rw-r--r-- | drivers/hid/hid-ids.h | 1 | ||||
-rw-r--r-- | drivers/hid/hid-multitouch.c | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index a98919199858..832897d4a849 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h | |||
@@ -75,6 +75,7 @@ | |||
75 | 75 | ||
76 | #define USB_VENDOR_ID_ALPS_JP 0x044E | 76 | #define USB_VENDOR_ID_ALPS_JP 0x044E |
77 | #define HID_DEVICE_ID_ALPS_U1_DUAL 0x120B | 77 | #define HID_DEVICE_ID_ALPS_U1_DUAL 0x120B |
78 | #define HID_DEVICE_ID_ALPS_U1_PTP_2 0x120A | ||
78 | #define HID_DEVICE_ID_ALPS_U1_DUAL_PTP 0x121F | 79 | #define HID_DEVICE_ID_ALPS_U1_DUAL_PTP 0x121F |
79 | #define HID_DEVICE_ID_ALPS_U1_DUAL_3BTN_PTP 0x1220 | 80 | #define HID_DEVICE_ID_ALPS_U1_DUAL_3BTN_PTP 0x1220 |
80 | 81 | ||
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c index 9e8c4d2ba11d..c78625dceced 100644 --- a/drivers/hid/hid-multitouch.c +++ b/drivers/hid/hid-multitouch.c | |||
@@ -1419,6 +1419,10 @@ static const struct hid_device_id mt_devices[] = { | |||
1419 | HID_DEVICE(BUS_I2C, HID_GROUP_MULTITOUCH_WIN_8, | 1419 | HID_DEVICE(BUS_I2C, HID_GROUP_MULTITOUCH_WIN_8, |
1420 | USB_VENDOR_ID_ALPS_JP, | 1420 | USB_VENDOR_ID_ALPS_JP, |
1421 | HID_DEVICE_ID_ALPS_U1_DUAL_3BTN_PTP) }, | 1421 | HID_DEVICE_ID_ALPS_U1_DUAL_3BTN_PTP) }, |
1422 | { .driver_data = MT_CLS_WIN_8_DUAL, | ||
1423 | HID_DEVICE(BUS_I2C, HID_GROUP_MULTITOUCH_WIN_8, | ||
1424 | USB_VENDOR_ID_ALPS_JP, | ||
1425 | HID_DEVICE_ID_ALPS_U1_PTP_2) }, | ||
1422 | 1426 | ||
1423 | /* Lenovo X1 TAB Gen 2 */ | 1427 | /* Lenovo X1 TAB Gen 2 */ |
1424 | { .driver_data = MT_CLS_WIN_8_DUAL, | 1428 | { .driver_data = MT_CLS_WIN_8_DUAL, |