aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/hid/Kconfig1
-rw-r--r--drivers/hid/hid-core.c1
-rw-r--r--drivers/hid/hid-ids.h3
-rw-r--r--drivers/hid/hid-multitouch.c5
4 files changed, 10 insertions, 0 deletions
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index d2d4e5f1911e..d9635d6a907a 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -306,6 +306,7 @@ config HID_MULTITOUCH
306 - Cando dual touch panel 306 - Cando dual touch panel
307 - Cypress TrueTouch panels 307 - Cypress TrueTouch panels
308 - Hanvon dual touch panels 308 - Hanvon dual touch panels
309 - Ilitek dual touch panel
309 - IrTouch Infrared USB panels 310 - IrTouch Infrared USB panels
310 - MosArt dual-touch panels 311 - MosArt dual-touch panels
311 - PenMount dual touch panels 312 - PenMount dual touch panels
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index 6e31b9f93329..c0ea857ed429 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1377,6 +1377,7 @@ static const struct hid_device_id hid_have_special_driver[] = {
1377 { HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE_2) }, 1377 { HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE_2) },
1378 { HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE_3) }, 1378 { HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE_3) },
1379 { HID_USB_DEVICE(USB_VENDOR_ID_HANVON, USB_DEVICE_ID_HANVON_MULTITOUCH) }, 1379 { HID_USB_DEVICE(USB_VENDOR_ID_HANVON, USB_DEVICE_ID_HANVON_MULTITOUCH) },
1380 { HID_USB_DEVICE(USB_VENDOR_ID_ILITEK, USB_DEVICE_ID_ILITEK_MULTITOUCH) },
1380 { HID_USB_DEVICE(USB_VENDOR_ID_IRTOUCHSYSTEMS, USB_DEVICE_ID_IRTOUCH_INFRARED_USB) }, 1381 { HID_USB_DEVICE(USB_VENDOR_ID_IRTOUCHSYSTEMS, USB_DEVICE_ID_IRTOUCH_INFRARED_USB) },
1381 { HID_USB_DEVICE(USB_VENDOR_ID_KENSINGTON, USB_DEVICE_ID_KS_SLIMBLADE) }, 1382 { HID_USB_DEVICE(USB_VENDOR_ID_KENSINGTON, USB_DEVICE_ID_KS_SLIMBLADE) },
1382 { HID_USB_DEVICE(USB_VENDOR_ID_KEYTOUCH, USB_DEVICE_ID_KEYTOUCH_IEC) }, 1383 { HID_USB_DEVICE(USB_VENDOR_ID_KEYTOUCH, USB_DEVICE_ID_KEYTOUCH_IEC) },
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 252aebae5701..0f29b3facca1 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -330,6 +330,9 @@
330#define USB_DEVICE_ID_UGCI_FLYING 0x0020 330#define USB_DEVICE_ID_UGCI_FLYING 0x0020
331#define USB_DEVICE_ID_UGCI_FIGHTING 0x0030 331#define USB_DEVICE_ID_UGCI_FIGHTING 0x0030
332 332
333#define USB_VENDOR_ID_ILITEK 0x222a
334#define USB_DEVICE_ID_ILITEK_MULTITOUCH 0x0001
335
333#define USB_VENDOR_ID_IMATION 0x0718 336#define USB_VENDOR_ID_IMATION 0x0718
334#define USB_DEVICE_ID_DISC_STAKKA 0xd000 337#define USB_DEVICE_ID_DISC_STAKKA 0xd000
335 338
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index bf46804670c7..b21251b43a35 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -589,6 +589,11 @@ static const struct hid_device_id mt_devices[] = {
589 HID_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH, 589 HID_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH,
590 USB_DEVICE_ID_GENERAL_TOUCH_WIN7_TWOFINGERS) }, 590 USB_DEVICE_ID_GENERAL_TOUCH_WIN7_TWOFINGERS) },
591 591
592 /* Ilitek dual touch panel */
593 { .driver_data = MT_CLS_DEFAULT,
594 HID_USB_DEVICE(USB_VENDOR_ID_ILITEK,
595 USB_DEVICE_ID_ILITEK_MULTITOUCH) },
596
592 /* IRTOUCH panels */ 597 /* IRTOUCH panels */
593 { .driver_data = MT_CLS_DUAL_INRANGE_CONTACTID, 598 { .driver_data = MT_CLS_DUAL_INRANGE_CONTACTID,
594 HID_USB_DEVICE(USB_VENDOR_ID_IRTOUCHSYSTEMS, 599 HID_USB_DEVICE(USB_VENDOR_ID_IRTOUCHSYSTEMS,