diff mbox

HID:multitouch:add driver for CJTouch MultiTouch

Message ID 1437410428-3261-1-git-send-email-linuxsea@163.com
State New, archived
Delegated to: Jiri Kosina
Headers show

Commit Message

linuxsea@163.com July 20, 2015, 4:40 p.m. UTC
From: Yang Bo <linuxsea@163.com>

Signed-off-by: Yang Bo <linuxsea@163.com>
---
 drivers/hid/Kconfig          |    1 +
 drivers/hid/hid-ids.h        |    4 ++++
 drivers/hid/hid-multitouch.c |    8 ++++++++
 3 files changed, 13 insertions(+)

Comments

Jiri Kosina July 24, 2015, 12:57 p.m. UTC | #1
On Mon, 20 Jul 2015, linuxsea@163.com wrote:

> From: Yang Bo <linuxsea@163.com>
> 
> Signed-off-by: Yang Bo <linuxsea@163.com>

Please work on improving your changelog-writing skills for your next 
submissions.

I've fixed this (provided a very brief changelog) and applied to 
for-4.3/multitouch.
diff mbox

Patch

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index cc4c664..57c94d7 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -480,6 +480,7 @@  config HID_MULTITOUCH
 	  - Atmel panels
 	  - Cando dual touch panels
 	  - Chunghwa panels
+	  - CJTouch panels
 	  - CVTouch panels
 	  - Cypress TrueTouch panels
 	  - Elan Microelectronics touch panels
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index b04b082..591b7d0 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -236,6 +236,10 @@ 
 
 #define USB_VENDOR_ID_CIDC		0x1677
 
+#define USB_VENDOR_ID_CJTOUCH		0x24b8
+#define USB_DEVICE_ID_CJTOUCH_MULTI_TOUCH_0020	0x0020
+#define USB_DEVICE_ID_CJTOUCH_MULTI_TOUCH_0040	0x0040
+
 #define USB_VENDOR_ID_CMEDIA		0x0d8c
 #define USB_DEVICE_ID_CM109		0x000e
 
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index 6a9b05b..ab0434f 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[] = {
 		MT_USB_DEVICE(USB_VENDOR_ID_CHUNGHWAT,
 			USB_DEVICE_ID_CHUNGHWAT_MULTITOUCH) },
 
+	/* CJTouch panels */
+	{ .driver_data = MT_CLS_NSMU,
+		MT_USB_DEVICE(USB_VENDOR_ID_CJTOUCH,
+			USB_DEVICE_ID_CJTOUCH_MULTI_TOUCH_0020) },
+	{ .driver_data = MT_CLS_NSMU,
+		MT_USB_DEVICE(USB_VENDOR_ID_CJTOUCH,
+			USB_DEVICE_ID_CJTOUCH_MULTI_TOUCH_0040) },
+
 	/* CVTouch panels */
 	{ .driver_data = MT_CLS_NSMU,
 		MT_USB_DEVICE(USB_VENDOR_ID_CVTOUCH,