From: Kai-Heng Feng Date: Mon, 26 Nov 2018 07:15:57 +0000 (+0000) Subject: HID: multitouch: Add pointstick support for Cirque Touchpad X-Git-Tag: Ubuntu-4.15.0-44.47~318 X-Git-Url: https://git.proxmox.com/?p=mirror_ubuntu-bionic-kernel.git;a=commitdiff_plain;h=5d3e1b772a0e1dc58d62a8857c13684482a18900 HID: multitouch: Add pointstick support for Cirque Touchpad BugLink: https://bugs.launchpad.net/bugs/1805081 Cirque Touchpad/Pointstick combo is similar to Alps devices, it requires MT_CLS_WIN_8_DUAL to expose its pointstick as a mouse. Signed-off-by: Kai-Heng Feng Signed-off-by: Jiri Kosina (cherry picked from commit 12d43aacf9a74d0eb66fd0ea54ebeb79ca28940f) Signed-off-by: Kai-Heng Feng Acked-by: Seth Forshee Acked-by: Khalid Elmously Signed-off-by: Khalid Elmously --- diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 92de8444b921..7e3d8b762617 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -269,6 +269,9 @@ #define USB_VENDOR_ID_CIDC 0x1677 +#define I2C_VENDOR_ID_CIRQUE 0x0488 +#define I2C_PRODUCT_ID_CIRQUE_121F 0x121F + #define USB_VENDOR_ID_CJTOUCH 0x24b8 #define USB_DEVICE_ID_CJTOUCH_MULTI_TOUCH_0020 0x0020 #define USB_DEVICE_ID_CJTOUCH_MULTI_TOUCH_0040 0x0040 diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c index e8dcd433937e..8aa76eb5d531 100644 --- a/drivers/hid/hid-multitouch.c +++ b/drivers/hid/hid-multitouch.c @@ -1522,6 +1522,12 @@ static const struct hid_device_id mt_devices[] = { MT_USB_DEVICE(USB_VENDOR_ID_CHUNGHWAT, USB_DEVICE_ID_CHUNGHWAT_MULTITOUCH) }, + /* Cirque devices */ + { .driver_data = MT_CLS_WIN_8_DUAL, + HID_DEVICE(BUS_I2C, HID_GROUP_MULTITOUCH_WIN_8, + I2C_VENDOR_ID_CIRQUE, + I2C_PRODUCT_ID_CIRQUE_121F) }, + /* CJTouch panels */ { .driver_data = MT_CLS_NSMU, MT_USB_DEVICE(USB_VENDOR_ID_CJTOUCH,