From 07e6d72b948409316e0f021d40ede3af8238a7a4 Mon Sep 17 00:00:00 2001 From: Benjamin Tissoires Date: Tue, 19 Jun 2012 14:39:54 +0200 Subject: [PATCH] --- yaml --- r: 316044 b: refs/heads/master c: 82d069822feaf9bf7eb85d5c9ba9a123ecc8f15f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/hid/Kconfig | 1 + trunk/drivers/hid/hid-ids.h | 3 +++ trunk/drivers/hid/hid-multitouch.c | 5 +++++ 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 26564b110067..ea508dae8d42 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4aceed37e315e8eaa26cb4c8dfd619a32fa24669 +refs/heads/master: 82d069822feaf9bf7eb85d5c9ba9a123ecc8f15f diff --git a/trunk/drivers/hid/Kconfig b/trunk/drivers/hid/Kconfig index e9c68fedfcff..bcaf3fa79e93 100644 --- a/trunk/drivers/hid/Kconfig +++ b/trunk/drivers/hid/Kconfig @@ -393,6 +393,7 @@ config HID_MULTITOUCH - Unitec Panels - XAT optical touch panels - Xiroku optical touch panels + - Zytronic touch panels If unsure, say N. diff --git a/trunk/drivers/hid/hid-ids.h b/trunk/drivers/hid/hid-ids.h index 734a2b986502..c77bfdde94ed 100644 --- a/trunk/drivers/hid/hid-ids.h +++ b/trunk/drivers/hid/hid-ids.h @@ -802,6 +802,9 @@ #define USB_VENDOR_ID_ZYDACRON 0x13EC #define USB_DEVICE_ID_ZYDACRON_REMOTE_CONTROL 0x0006 +#define USB_VENDOR_ID_ZYTRONIC 0x14c8 +#define USB_DEVICE_ID_ZYTRONIC_ZXY100 0x0005 + #define USB_VENDOR_ID_PRIMAX 0x0461 #define USB_DEVICE_ID_PRIMAX_KEYBOARD 0x4e05 diff --git a/trunk/drivers/hid/hid-multitouch.c b/trunk/drivers/hid/hid-multitouch.c index 9a3891e00cdd..59c8b5c1d2de 100644 --- a/trunk/drivers/hid/hid-multitouch.c +++ b/trunk/drivers/hid/hid-multitouch.c @@ -1064,6 +1064,11 @@ static const struct hid_device_id mt_devices[] = { MT_USB_DEVICE(USB_VENDOR_ID_XIROKU, USB_DEVICE_ID_XIROKU_CSR2) }, + /* Zytronic panels */ + { .driver_data = MT_CLS_SERIAL, + MT_USB_DEVICE(USB_VENDOR_ID_ZYTRONIC, + USB_DEVICE_ID_ZYTRONIC_ZXY100) }, + /* Generic MT device */ { HID_DEVICE(HID_BUS_ANY, HID_GROUP_MULTITOUCH, HID_ANY_ID, HID_ANY_ID) }, { }