aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaiChung Cheng <kenny_cheng@wistron.com>2013-11-21 04:04:30 -0500
committerJiri Kosina <jkosina@suse.cz>2013-11-21 04:04:30 -0500
commitbf9d121efc18c30caa2caad85358cf9408eca117 (patch)
tree0ffa09b55b56282ae5c2d73e16ab1eee1c935d20
parent3d18bd41a82fac69c82e1725c7beea25b17a0190 (diff)
HID: multicouh: add PID VID to support 1 new Wistron optical touch device
This patch adds PID VID to support for the Wistron Inc. Optical touch panel. Signed-off-by: KaiChung Cheng <kenny_cheng@wistron.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
-rw-r--r--drivers/hid/Kconfig1
-rw-r--r--drivers/hid/hid-ids.h3
-rw-r--r--drivers/hid/hid-multitouch.c6
3 files changed, 10 insertions, 0 deletions
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index 329fbb9b5976..34e2d39d4ce8 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -460,6 +460,7 @@ config HID_MULTITOUCH
460 - Stantum multitouch panels 460 - Stantum multitouch panels
461 - Touch International Panels 461 - Touch International Panels
462 - Unitec Panels 462 - Unitec Panels
463 - Wistron optical touch panels
463 - XAT optical touch panels 464 - XAT optical touch panels
464 - Xiroku optical touch panels 465 - Xiroku optical touch panels
465 - Zytronic touch panels 466 - Zytronic touch panels
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 60336f06874c..45bd7b9b4cb3 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -901,6 +901,9 @@
901#define USB_DEVICE_ID_SUPER_DUAL_BOX_PRO 0x8802 901#define USB_DEVICE_ID_SUPER_DUAL_BOX_PRO 0x8802
902#define USB_DEVICE_ID_SUPER_JOY_BOX_5_PRO 0x8804 902#define USB_DEVICE_ID_SUPER_JOY_BOX_5_PRO 0x8804
903 903
904#define USB_VENDOR_ID_WISTRON 0x0fb8
905#define USB_DEVICE_ID_WISTRON_OPTICAL_TOUCH 0x1109
906
904#define USB_VENDOR_ID_X_TENSIONS 0x1ae7 907#define USB_VENDOR_ID_X_TENSIONS 0x1ae7
905#define USB_DEVICE_ID_SPEEDLINK_VAD_CEZANNE 0x9001 908#define USB_DEVICE_ID_SPEEDLINK_VAD_CEZANNE 0x9001
906 909
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index a2cedb8ae1c0..d83b1e8b505b 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -1335,6 +1335,12 @@ static const struct hid_device_id mt_devices[] = {
1335 { .driver_data = MT_CLS_NSMU, 1335 { .driver_data = MT_CLS_NSMU,
1336 MT_USB_DEVICE(USB_VENDOR_ID_UNITEC, 1336 MT_USB_DEVICE(USB_VENDOR_ID_UNITEC,
1337 USB_DEVICE_ID_UNITEC_USB_TOUCH_0A19) }, 1337 USB_DEVICE_ID_UNITEC_USB_TOUCH_0A19) },
1338
1339 /* Wistron panels */
1340 { .driver_data = MT_CLS_NSMU,
1341 MT_USB_DEVICE(USB_VENDOR_ID_WISTRON,
1342 USB_DEVICE_ID_WISTRON_OPTICAL_TOUCH) },
1343
1338 /* XAT */ 1344 /* XAT */
1339 { .driver_data = MT_CLS_NSMU, 1345 { .driver_data = MT_CLS_NSMU,
1340 MT_USB_DEVICE(USB_VENDOR_ID_XAT, 1346 MT_USB_DEVICE(USB_VENDOR_ID_XAT,