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-06-28 04:29:55 -0400
commit82d069822feaf9bf7eb85d5c9ba9a123ecc8f15f (patch)
tree16a8c300af250d6cc81048eafd2a0e36a4e1b8f5 /drivers/hid
parent4aceed37e315e8eaa26cb4c8dfd619a32fa24669 (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 e9c68fedfcf..bcaf3fa79e9 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -393,6 +393,7 @@ config HID_MULTITOUCH
393 - Unitec Panels 393 - Unitec Panels
394 - XAT optical touch panels 394 - XAT optical touch panels
395 - Xiroku optical touch panels 395 - Xiroku optical touch panels
396 - Zytronic touch panels
396 397
397 If unsure, say N. 398 If unsure, say N.
398 399
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 734a2b98650..c77bfdde94e 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -802,6 +802,9 @@
802#define USB_VENDOR_ID_ZYDACRON 0x13EC 802#define USB_VENDOR_ID_ZYDACRON 0x13EC
803#define USB_DEVICE_ID_ZYDACRON_REMOTE_CONTROL 0x0006 803#define USB_DEVICE_ID_ZYDACRON_REMOTE_CONTROL 0x0006
804 804
805#define USB_VENDOR_ID_ZYTRONIC 0x14c8
806#define USB_DEVICE_ID_ZYTRONIC_ZXY100 0x0005
807
805#define USB_VENDOR_ID_PRIMAX 0x0461 808#define USB_VENDOR_ID_PRIMAX 0x0461
806#define USB_DEVICE_ID_PRIMAX_KEYBOARD 0x4e05 809#define USB_DEVICE_ID_PRIMAX_KEYBOARD 0x4e05
807 810
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index 9a3891e00cd..59c8b5c1d2d 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -1064,6 +1064,11 @@ static const struct hid_device_id mt_devices[] = {
1064 MT_USB_DEVICE(USB_VENDOR_ID_XIROKU, 1064 MT_USB_DEVICE(USB_VENDOR_ID_XIROKU,
1065 USB_DEVICE_ID_XIROKU_CSR2) }, 1065 USB_DEVICE_ID_XIROKU_CSR2) },
1066 1066
1067 /* Zytronic panels */
1068 { .driver_data = MT_CLS_SERIAL,
1069 MT_USB_DEVICE(USB_VENDOR_ID_ZYTRONIC,
1070 USB_DEVICE_ID_ZYTRONIC_ZXY100) },
1071
1067 /* Generic MT device */ 1072 /* Generic MT device */
1068 { HID_DEVICE(HID_BUS_ANY, HID_GROUP_MULTITOUCH, HID_ANY_ID, HID_ANY_ID) }, 1073 { HID_DEVICE(HID_BUS_ANY, HID_GROUP_MULTITOUCH, HID_ANY_ID, HID_ANY_ID) },
1069 { } 1074 { }