aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hid
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/hid')
-rw-r--r--drivers/hid/Kconfig1
-rw-r--r--drivers/hid/hid-core.c1
-rw-r--r--drivers/hid/hid-ids.h3
-rw-r--r--drivers/hid/hid-multitouch.c4
4 files changed, 9 insertions, 0 deletions
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index acc39e8ef3e7..6008e634853e 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -335,6 +335,7 @@ config HID_MULTITOUCH
335 - Stantum multitouch panels 335 - Stantum multitouch panels
336 - Touch International Panels 336 - Touch International Panels
337 - Unitec Panels 337 - Unitec Panels
338 - XAT optical touch panels
338 339
339 If unsure, say N. 340 If unsure, say N.
340 341
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index 2a268fc4db9a..1ae647e3e81c 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1500,6 +1500,7 @@ static const struct hid_device_id hid_have_special_driver[] = {
1500 { HID_USB_DEVICE(USB_VENDOR_ID_WALTOP, USB_DEVICE_ID_WALTOP_SLIM_TABLET_12_1_INCH) }, 1500 { HID_USB_DEVICE(USB_VENDOR_ID_WALTOP, USB_DEVICE_ID_WALTOP_SLIM_TABLET_12_1_INCH) },
1501 { HID_USB_DEVICE(USB_VENDOR_ID_WALTOP, USB_DEVICE_ID_WALTOP_MEDIA_TABLET_10_6_INCH) }, 1501 { HID_USB_DEVICE(USB_VENDOR_ID_WALTOP, USB_DEVICE_ID_WALTOP_MEDIA_TABLET_10_6_INCH) },
1502 { HID_USB_DEVICE(USB_VENDOR_ID_WALTOP, USB_DEVICE_ID_WALTOP_MEDIA_TABLET_14_1_INCH) }, 1502 { HID_USB_DEVICE(USB_VENDOR_ID_WALTOP, USB_DEVICE_ID_WALTOP_MEDIA_TABLET_14_1_INCH) },
1503 { HID_USB_DEVICE(USB_VENDOR_ID_XAT, USB_DEVICE_ID_XAT_CSR) },
1503 { HID_USB_DEVICE(USB_VENDOR_ID_X_TENSIONS, USB_DEVICE_ID_SPEEDLINK_VAD_CEZANNE) }, 1504 { HID_USB_DEVICE(USB_VENDOR_ID_X_TENSIONS, USB_DEVICE_ID_SPEEDLINK_VAD_CEZANNE) },
1504 { HID_USB_DEVICE(USB_VENDOR_ID_ZEROPLUS, 0x0005) }, 1505 { HID_USB_DEVICE(USB_VENDOR_ID_ZEROPLUS, 0x0005) },
1505 { HID_USB_DEVICE(USB_VENDOR_ID_ZEROPLUS, 0x0030) }, 1506 { HID_USB_DEVICE(USB_VENDOR_ID_ZEROPLUS, 0x0030) },
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 2c8594767191..f9717e2a95a2 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -667,6 +667,9 @@
667#define USB_VENDOR_ID_X_TENSIONS 0x1ae7 667#define USB_VENDOR_ID_X_TENSIONS 0x1ae7
668#define USB_DEVICE_ID_SPEEDLINK_VAD_CEZANNE 0x9001 668#define USB_DEVICE_ID_SPEEDLINK_VAD_CEZANNE 0x9001
669 669
670#define USB_VENDOR_ID_XAT 0x2505
671#define USB_DEVICE_ID_XAT_CSR 0x0220
672
670#define USB_VENDOR_ID_YEALINK 0x6993 673#define USB_VENDOR_ID_YEALINK 0x6993
671#define USB_DEVICE_ID_YEALINK_P1K_P4K_B2K 0xb001 674#define USB_DEVICE_ID_YEALINK_P1K_P4K_B2K 0xb001
672 675
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index ecd4d2db9e80..c0d1b15ca67c 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -699,6 +699,10 @@ static const struct hid_device_id mt_devices[] = {
699 { .driver_data = MT_CLS_DEFAULT, 699 { .driver_data = MT_CLS_DEFAULT,
700 HID_USB_DEVICE(USB_VENDOR_ID_UNITEC, 700 HID_USB_DEVICE(USB_VENDOR_ID_UNITEC,
701 USB_DEVICE_ID_UNITEC_USB_TOUCH_0A19) }, 701 USB_DEVICE_ID_UNITEC_USB_TOUCH_0A19) },
702 /* XAT */
703 { .driver_data = MT_CLS_DEFAULT,
704 HID_USB_DEVICE(USB_VENDOR_ID_XAT,
705 USB_DEVICE_ID_XAT_CSR) },
702 706
703 { } 707 { }
704}; 708};