aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hid
diff options
context:
space:
mode:
authorBenjamin Tissoires <benjamin.tissoires@enac.fr>2011-05-19 08:18:16 -0400
committerJiri Kosina <jkosina@suse.cz>2011-05-20 07:35:42 -0400
commit5e74e56da03f581482c104628951eeb1455848ea (patch)
treea2bdaf0760dc717edd8261e1d50363a373d9ca30 /drivers/hid
parentee0fbd149182d91e3b9df7b306eb03cd1f1dd4a1 (diff)
HID: hid-multitouch: add support for Touch International panels
This patch introduce support for Touch International panels. This device has not been optimized in term of kernel processing operations (default class), but it will work. Signed-off-by: Benjamin Tissoires <benjamin.tissoires@enac.fr> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid')
-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 9a8ecc03416e..34ba931a268b 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -320,6 +320,7 @@ config HID_MULTITOUCH
320 - eGalax dual-touch panels, including the 320 - eGalax dual-touch panels, including the
321 Joojoo and Wetab tablets 321 Joojoo and Wetab tablets
322 - Stantum multitouch panels 322 - Stantum multitouch panels
323 - Touch International Panels
323 324
324 If unsure, say N. 325 If unsure, say N.
325 326
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index 5ba23fbfc5a7..697ee3fe798e 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1472,6 +1472,7 @@ static const struct hid_device_id hid_have_special_driver[] = {
1472 { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb65a) }, 1472 { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb65a) },
1473 { HID_USB_DEVICE(USB_VENDOR_ID_TOPSEED, USB_DEVICE_ID_TOPSEED_CYBERLINK) }, 1473 { HID_USB_DEVICE(USB_VENDOR_ID_TOPSEED, USB_DEVICE_ID_TOPSEED_CYBERLINK) },
1474 { HID_USB_DEVICE(USB_VENDOR_ID_TOPSEED2, USB_DEVICE_ID_TOPSEED2_RF_COMBO) }, 1474 { HID_USB_DEVICE(USB_VENDOR_ID_TOPSEED2, USB_DEVICE_ID_TOPSEED2_RF_COMBO) },
1475 { HID_USB_DEVICE(USB_VENDOR_ID_TOUCH_INTL, USB_DEVICE_ID_TOUCH_INTL_MULTI_TOUCH) },
1475 { HID_USB_DEVICE(USB_VENDOR_ID_TWINHAN, USB_DEVICE_ID_TWINHAN_IR_REMOTE) }, 1476 { HID_USB_DEVICE(USB_VENDOR_ID_TWINHAN, USB_DEVICE_ID_TWINHAN_IR_REMOTE) },
1476 { HID_USB_DEVICE(USB_VENDOR_ID_TURBOX, USB_DEVICE_ID_TURBOX_TOUCHSCREEN_MOSART) }, 1477 { HID_USB_DEVICE(USB_VENDOR_ID_TURBOX, USB_DEVICE_ID_TURBOX_TOUCHSCREEN_MOSART) },
1477 { HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_TABLET_PF1209) }, 1478 { HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_TABLET_PF1209) },
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 5ad823528e24..84871ebbe937 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -574,6 +574,9 @@
574#define USB_VENDOR_ID_TOPMAX 0x0663 574#define USB_VENDOR_ID_TOPMAX 0x0663
575#define USB_DEVICE_ID_TOPMAX_COBRAPAD 0x0103 575#define USB_DEVICE_ID_TOPMAX_COBRAPAD 0x0103
576 576
577#define USB_VENDOR_ID_TOUCH_INTL 0x1e5e
578#define USB_DEVICE_ID_TOUCH_INTL_MULTI_TOUCH 0x0313
579
577#define USB_VENDOR_ID_TOUCHPACK 0x1bfd 580#define USB_VENDOR_ID_TOUCHPACK 0x1bfd
578#define USB_DEVICE_ID_TOUCHPACK_RTS 0x1688 581#define USB_DEVICE_ID_TOUCHPACK_RTS 0x1688
579 582
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index 76ef60db15cc..bc5761591a60 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -683,6 +683,11 @@ static const struct hid_device_id mt_devices[] = {
683 HID_USB_DEVICE(USB_VENDOR_ID_STANTUM, 683 HID_USB_DEVICE(USB_VENDOR_ID_STANTUM,
684 USB_DEVICE_ID_MTP_SITRONIX)}, 684 USB_DEVICE_ID_MTP_SITRONIX)},
685 685
686 /* Touch International panels */
687 { .driver_data = MT_CLS_DEFAULT,
688 HID_USB_DEVICE(USB_VENDOR_ID_TOUCH_INTL,
689 USB_DEVICE_ID_TOUCH_INTL_MULTI_TOUCH) },
690
686 { } 691 { }
687}; 692};
688MODULE_DEVICE_TABLE(hid, mt_devices); 693MODULE_DEVICE_TABLE(hid, mt_devices);