diff options
author | KaiChung Cheng <kenny_cheng@wistron.com> | 2013-11-21 04:04:30 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-04 13:57:20 -0500 |
commit | 7d366a5ec599406ca43fd4b967d0a81307c3bce4 (patch) | |
tree | 657299236d806280eadaef52373bac1ed4dff712 | |
parent | 505014c1880ece595f7ac118c10efc432213bf58 (diff) |
HID: multicouh: add PID VID to support 1 new Wistron optical touch device
commit bf9d121efc18c30caa2caad85358cf9408eca117 upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/hid/Kconfig | 1 | ||||
-rw-r--r-- | drivers/hid/hid-ids.h | 3 | ||||
-rw-r--r-- | drivers/hid/hid-multitouch.c | 6 |
3 files changed, 10 insertions, 0 deletions
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index 731240d1c1ef..bee88ee8066e 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig | |||
@@ -442,6 +442,7 @@ config HID_MULTITOUCH | |||
442 | - Stantum multitouch panels | 442 | - Stantum multitouch panels |
443 | - Touch International Panels | 443 | - Touch International Panels |
444 | - Unitec Panels | 444 | - Unitec Panels |
445 | - Wistron optical touch panels | ||
445 | - XAT optical touch panels | 446 | - XAT optical touch panels |
446 | - Xiroku optical touch panels | 447 | - Xiroku optical touch panels |
447 | - Zytronic touch panels | 448 | - Zytronic touch panels |
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 76aa9894b463..799dbec2646b 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h | |||
@@ -879,6 +879,9 @@ | |||
879 | #define USB_DEVICE_ID_SUPER_DUAL_BOX_PRO 0x8802 | 879 | #define USB_DEVICE_ID_SUPER_DUAL_BOX_PRO 0x8802 |
880 | #define USB_DEVICE_ID_SUPER_JOY_BOX_5_PRO 0x8804 | 880 | #define USB_DEVICE_ID_SUPER_JOY_BOX_5_PRO 0x8804 |
881 | 881 | ||
882 | #define USB_VENDOR_ID_WISTRON 0x0fb8 | ||
883 | #define USB_DEVICE_ID_WISTRON_OPTICAL_TOUCH 0x1109 | ||
884 | |||
882 | #define USB_VENDOR_ID_X_TENSIONS 0x1ae7 | 885 | #define USB_VENDOR_ID_X_TENSIONS 0x1ae7 |
883 | #define USB_DEVICE_ID_SPEEDLINK_VAD_CEZANNE 0x9001 | 886 | #define USB_DEVICE_ID_SPEEDLINK_VAD_CEZANNE 0x9001 |
884 | 887 | ||
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c index f79ad2cb3f4a..3d8e58ac7499 100644 --- a/drivers/hid/hid-multitouch.c +++ b/drivers/hid/hid-multitouch.c | |||
@@ -1353,6 +1353,12 @@ static const struct hid_device_id mt_devices[] = { | |||
1353 | { .driver_data = MT_CLS_NSMU, | 1353 | { .driver_data = MT_CLS_NSMU, |
1354 | MT_USB_DEVICE(USB_VENDOR_ID_UNITEC, | 1354 | MT_USB_DEVICE(USB_VENDOR_ID_UNITEC, |
1355 | USB_DEVICE_ID_UNITEC_USB_TOUCH_0A19) }, | 1355 | USB_DEVICE_ID_UNITEC_USB_TOUCH_0A19) }, |
1356 | |||
1357 | /* Wistron panels */ | ||
1358 | { .driver_data = MT_CLS_NSMU, | ||
1359 | MT_USB_DEVICE(USB_VENDOR_ID_WISTRON, | ||
1360 | USB_DEVICE_ID_WISTRON_OPTICAL_TOUCH) }, | ||
1361 | |||
1356 | /* XAT */ | 1362 | /* XAT */ |
1357 | { .driver_data = MT_CLS_NSMU, | 1363 | { .driver_data = MT_CLS_NSMU, |
1358 | MT_USB_DEVICE(USB_VENDOR_ID_XAT, | 1364 | MT_USB_DEVICE(USB_VENDOR_ID_XAT, |