aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hid
diff options
context:
space:
mode:
authorBenjamin Tissoires <benjamin.tissoires@enac.fr>2011-05-19 08:18:17 -0400
committerJiri Kosina <jkosina@suse.cz>2011-05-20 07:35:42 -0400
commit617b64f97708be26a061e6c8178ad46b4c49d031 (patch)
tree91e1fb13b4333629cc21607d6c1373e7635924ce /drivers/hid
parent5e74e56da03f581482c104628951eeb1455848ea (diff)
HID: hid-multitouch: add support for Unitec panels
This patch introduce support for Unitec panels. This device has not been optimized in term of kernel processing operations (default class), but it will work. 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-core.c2
-rw-r--r--drivers/hid/hid-ids.h4
-rw-r--r--drivers/hid/hid-multitouch.c8
4 files changed, 15 insertions, 0 deletions
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index 34ba931a268b..88e6b2b9a42e 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -321,6 +321,7 @@ config HID_MULTITOUCH
321 Joojoo and Wetab tablets 321 Joojoo and Wetab tablets
322 - Stantum multitouch panels 322 - Stantum multitouch panels
323 - Touch International Panels 323 - Touch International Panels
324 - Unitec Panels
324 325
325 If unsure, say N. 326 If unsure, say N.
326 327
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index 697ee3fe798e..9f15c9238fb2 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1479,6 +1479,8 @@ static const struct hid_device_id hid_have_special_driver[] = {
1479 { HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_TABLET_WP4030U) }, 1479 { HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_TABLET_WP4030U) },
1480 { HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_TABLET_WP5540U) }, 1480 { HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_TABLET_WP5540U) },
1481 { HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_TABLET_WP8060U) }, 1481 { HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_TABLET_WP8060U) },
1482 { HID_USB_DEVICE(USB_VENDOR_ID_UNITEC, USB_DEVICE_ID_UNITEC_USB_TOUCH_0709) },
1483 { HID_USB_DEVICE(USB_VENDOR_ID_UNITEC, USB_DEVICE_ID_UNITEC_USB_TOUCH_0A19) },
1482 { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_SMARTJOY_PLUS) }, 1484 { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_SMARTJOY_PLUS) },
1483 { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_GRAPHIRE_BLUETOOTH) }, 1485 { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_GRAPHIRE_BLUETOOTH) },
1484 { HID_USB_DEVICE(USB_VENDOR_ID_WALTOP, USB_DEVICE_ID_WALTOP_SLIM_TABLET_5_8_INCH) }, 1486 { HID_USB_DEVICE(USB_VENDOR_ID_WALTOP, USB_DEVICE_ID_WALTOP_SLIM_TABLET_5_8_INCH) },
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 84871ebbe937..b8299ef0f01c 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -594,6 +594,10 @@
594#define USB_DEVICE_ID_UCLOGIC_TABLET_WP5540U 0x0004 594#define USB_DEVICE_ID_UCLOGIC_TABLET_WP5540U 0x0004
595#define USB_DEVICE_ID_UCLOGIC_TABLET_WP8060U 0x0005 595#define USB_DEVICE_ID_UCLOGIC_TABLET_WP8060U 0x0005
596 596
597#define USB_VENDOR_ID_UNITEC 0x227d
598#define USB_DEVICE_ID_UNITEC_USB_TOUCH_0709 0x0709
599#define USB_DEVICE_ID_UNITEC_USB_TOUCH_0A19 0x0a19
600
597#define USB_VENDOR_ID_VERNIER 0x08f7 601#define USB_VENDOR_ID_VERNIER 0x08f7
598#define USB_DEVICE_ID_VERNIER_LABPRO 0x0001 602#define USB_DEVICE_ID_VERNIER_LABPRO 0x0001
599#define USB_DEVICE_ID_VERNIER_GOTEMP 0x0002 603#define USB_DEVICE_ID_VERNIER_GOTEMP 0x0002
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index bc5761591a60..feeb0b7b6db2 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -688,6 +688,14 @@ static const struct hid_device_id mt_devices[] = {
688 HID_USB_DEVICE(USB_VENDOR_ID_TOUCH_INTL, 688 HID_USB_DEVICE(USB_VENDOR_ID_TOUCH_INTL,
689 USB_DEVICE_ID_TOUCH_INTL_MULTI_TOUCH) }, 689 USB_DEVICE_ID_TOUCH_INTL_MULTI_TOUCH) },
690 690
691 /* Unitec panels */
692 { .driver_data = MT_CLS_DEFAULT,
693 HID_USB_DEVICE(USB_VENDOR_ID_UNITEC,
694 USB_DEVICE_ID_UNITEC_USB_TOUCH_0709) },
695 { .driver_data = MT_CLS_DEFAULT,
696 HID_USB_DEVICE(USB_VENDOR_ID_UNITEC,
697 USB_DEVICE_ID_UNITEC_USB_TOUCH_0A19) },
698
691 { } 699 { }
692}; 700};
693MODULE_DEVICE_TABLE(hid, mt_devices); 701MODULE_DEVICE_TABLE(hid, mt_devices);