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
           - 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 b04b0820d816..591b7d06f54d 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 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[] = {
                 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,