aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYang Bo <linuxsea@163.com>2015-07-20 12:40:28 -0400
committerJiri Kosina <jkosina@suse.com>2015-07-24 08:56:19 -0400
commit070f63b46ac893a5debf68c5751101b6f5f77230 (patch)
tree23a60c881ce68ee7b718ab21119b52acbd0d00c2
parent67db8a8086e9b865533348954f5547f1e433101e (diff)
HID: multitouch: Add support for CJTouch MultiTouch
Add device IDs for CJTouch 0020 and 0040 panels. Signed-off-by: Yang Bo <linuxsea@163.com> Signed-off-by: Jiri Kosina <jkosina@suse.com>
-rw-r--r--drivers/hid/Kconfig1
-rw-r--r--drivers/hid/hid-ids.h4
-rw-r--r--drivers/hid/hid-multitouch.c8
3 files changed, 13 insertions, 0 deletions
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index cc4c6649d195..57c94d7d5834 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -480,6 +480,7 @@ config HID_MULTITOUCH
480 - Atmel panels 480 - Atmel panels
481 - Cando dual touch panels 481 - Cando dual touch panels
482 - Chunghwa panels 482 - Chunghwa panels
483 - CJTouch panels
483 - CVTouch panels 484 - CVTouch panels
484 - Cypress TrueTouch panels 485 - Cypress TrueTouch panels
485 - Elan Microelectronics touch panels 486 - Elan Microelectronics touch panels
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index b04b0820d816..591b7d06f54d 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -236,6 +236,10 @@
236 236
237#define USB_VENDOR_ID_CIDC 0x1677 237#define USB_VENDOR_ID_CIDC 0x1677
238 238
239#define USB_VENDOR_ID_CJTOUCH 0x24b8
240#define USB_DEVICE_ID_CJTOUCH_MULTI_TOUCH_0020 0x0020
241#define USB_DEVICE_ID_CJTOUCH_MULTI_TOUCH_0040 0x0040
242
239#define USB_VENDOR_ID_CMEDIA 0x0d8c 243#define USB_VENDOR_ID_CMEDIA 0x0d8c
240#define USB_DEVICE_ID_CM109 0x000e 244#define USB_DEVICE_ID_CM109 0x000e
241 245
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index 6a9b05b328a9..ab0434f86f49 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -1138,6 +1138,14 @@ static const struct hid_device_id mt_devices[] = {
1138 MT_USB_DEVICE(USB_VENDOR_ID_CHUNGHWAT, 1138 MT_USB_DEVICE(USB_VENDOR_ID_CHUNGHWAT,
1139 USB_DEVICE_ID_CHUNGHWAT_MULTITOUCH) }, 1139 USB_DEVICE_ID_CHUNGHWAT_MULTITOUCH) },
1140 1140
1141 /* CJTouch panels */
1142 { .driver_data = MT_CLS_NSMU,
1143 MT_USB_DEVICE(USB_VENDOR_ID_CJTOUCH,
1144 USB_DEVICE_ID_CJTOUCH_MULTI_TOUCH_0020) },
1145 { .driver_data = MT_CLS_NSMU,
1146 MT_USB_DEVICE(USB_VENDOR_ID_CJTOUCH,
1147 USB_DEVICE_ID_CJTOUCH_MULTI_TOUCH_0040) },
1148
1141 /* CVTouch panels */ 1149 /* CVTouch panels */
1142 { .driver_data = MT_CLS_NSMU, 1150 { .driver_data = MT_CLS_NSMU,
1143 MT_USB_DEVICE(USB_VENDOR_ID_CVTOUCH, 1151 MT_USB_DEVICE(USB_VENDOR_ID_CVTOUCH,