aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hid
diff options
context:
space:
mode:
authorBenjamin Tissoires <benjamin.tissoires@enac.fr>2012-06-19 08:39:54 -0400
committerJiri Kosina <jkosina@suse.cz>2012-07-19 07:56:16 -0400
commite9a09aed3eff8b1706e4bc24e8b3b16283797353 (patch)
treef4bf3893b8ddfec9936297350eecaf37bbbee03d /drivers/hid
parent0e050923a797c1fc46ccc1e5182fd3090f33a75d (diff)
HID: hid-multitouch: add support for Zytronic panels
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-ids.h3
-rw-r--r--drivers/hid/hid-multitouch.c5
3 files changed, 9 insertions, 0 deletions
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index bef04c192768..3fda8c87f02c 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -386,6 +386,7 @@ config HID_MULTITOUCH
386 - Unitec Panels 386 - Unitec Panels
387 - XAT optical touch panels 387 - XAT optical touch panels
388 - Xiroku optical touch panels 388 - Xiroku optical touch panels
389 - Zytronic touch panels
389 390
390 If unsure, say N. 391 If unsure, say N.
391 392
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index fc0c68e4b9ed..5e4168e7ed1c 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -805,6 +805,9 @@
805#define USB_VENDOR_ID_ZYDACRON 0x13EC 805#define USB_VENDOR_ID_ZYDACRON 0x13EC
806#define USB_DEVICE_ID_ZYDACRON_REMOTE_CONTROL 0x0006 806#define USB_DEVICE_ID_ZYDACRON_REMOTE_CONTROL 0x0006
807 807
808#define USB_VENDOR_ID_ZYTRONIC 0x14c8
809#define USB_DEVICE_ID_ZYTRONIC_ZXY100 0x0005
810
808#define USB_VENDOR_ID_PRIMAX 0x0461 811#define USB_VENDOR_ID_PRIMAX 0x0461
809#define USB_DEVICE_ID_PRIMAX_KEYBOARD 0x4e05 812#define USB_DEVICE_ID_PRIMAX_KEYBOARD 0x4e05
810 813
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index 6e3332a99976..76479246d4ee 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -1048,6 +1048,11 @@ static const struct hid_device_id mt_devices[] = {
1048 MT_USB_DEVICE(USB_VENDOR_ID_XIROKU, 1048 MT_USB_DEVICE(USB_VENDOR_ID_XIROKU,
1049 USB_DEVICE_ID_XIROKU_CSR2) }, 1049 USB_DEVICE_ID_XIROKU_CSR2) },
1050 1050
1051 /* Zytronic panels */
1052 { .driver_data = MT_CLS_SERIAL,
1053 MT_USB_DEVICE(USB_VENDOR_ID_ZYTRONIC,
1054 USB_DEVICE_ID_ZYTRONIC_ZXY100) },
1055
1051 /* Generic MT device */ 1056 /* Generic MT device */
1052 { HID_DEVICE(HID_BUS_ANY, HID_GROUP_MULTITOUCH, HID_ANY_ID, HID_ANY_ID) }, 1057 { HID_DEVICE(HID_BUS_ANY, HID_GROUP_MULTITOUCH, HID_ANY_ID, HID_ANY_ID) },
1053 { } 1058 { }