aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hid
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2012-08-15 04:01:01 -0400
committerJiri Kosina <jkosina@suse.cz>2012-08-15 04:01:01 -0400
commit3d77104adb52a177ea85c2ff2311551cef67d52b (patch)
tree3394fb37cb294de0d91eda02febe9a3c9f258c3c /drivers/hid
parente8ff13b0bf88b5e696323a1eec877783d965b3c6 (diff)
HID: multitouch: add support for Touch Revolution touchscreens
Reported-by: Tom Mealey <thecompwiz@gmail.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid')
-rw-r--r--drivers/hid/hid-ids.h3
-rw-r--r--drivers/hid/hid-multitouch.c9
2 files changed, 12 insertions, 0 deletions
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 41c34f21bd00..0f7000472f18 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -270,6 +270,9 @@
270#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7302 0x7302 270#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7302 0x7302
271#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7349 0x7349 271#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7349 0x7349
272#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_A001 0xa001 272#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_A001 0xa001
273#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7224 0x7224
274#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72D0 0x72d0
275#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72C4 0x72c4
273 276
274#define USB_VENDOR_ID_ELECOM 0x056e 277#define USB_VENDOR_ID_ELECOM 0x056e
275#define USB_DEVICE_ID_ELECOM_BM084 0x0061 278#define USB_DEVICE_ID_ELECOM_BM084 0x0061
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index 59c8b5c1d2de..7b7fdc1149f1 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -886,6 +886,15 @@ static const struct hid_device_id mt_devices[] = {
886 { .driver_data = MT_CLS_EGALAX_SERIAL, 886 { .driver_data = MT_CLS_EGALAX_SERIAL,
887 MT_USB_DEVICE(USB_VENDOR_ID_DWAV, 887 MT_USB_DEVICE(USB_VENDOR_ID_DWAV,
888 USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_A001) }, 888 USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_A001) },
889 { .driver_data = MT_CLS_EGALAX,
890 HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
891 USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7224) },
892 { .driver_data = MT_CLS_EGALAX,
893 HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
894 USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72D0) },
895 { .driver_data = MT_CLS_EGALAX,
896 HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
897 USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72C4) },
889 898
890 /* Elo TouchSystems IntelliTouch Plus panel */ 899 /* Elo TouchSystems IntelliTouch Plus panel */
891 { .driver_data = MT_CLS_DUAL_NSMU_CONTACTID, 900 { .driver_data = MT_CLS_DUAL_NSMU_CONTACTID,