aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hid
diff options
context:
space:
mode:
authorBenjamin Tissoires <benjamin.tissoires@enac.fr>2011-05-19 08:18:15 -0400
committerJiri Kosina <jkosina@suse.cz>2011-05-20 07:35:42 -0400
commitee0fbd149182d91e3b9df7b306eb03cd1f1dd4a1 (patch)
treeef322e70290fafce181f2602eb77aa7c580d954c /drivers/hid
parent79603dc9a8223856cf3194dcabad32b9828c7be9 (diff)
HID: hid-multitouch: add support for GoodTouch panels
This patch introduce support for GoodTouch 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.c1
-rw-r--r--drivers/hid/hid-ids.h3
-rw-r--r--drivers/hid/hid-multitouch.c5
4 files changed, 10 insertions, 0 deletions
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index 3e14815eba36..9a8ecc03416e 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -308,6 +308,7 @@ config HID_MULTITOUCH
308 - CVTouch panels 308 - CVTouch panels
309 - Cypress TrueTouch panels 309 - Cypress TrueTouch panels
310 - Elo TouchSystems IntelliTouch Plus panels 310 - Elo TouchSystems IntelliTouch Plus panels
311 - GoodTouch panels
311 - Hanvon dual touch panels 312 - Hanvon dual touch panels
312 - Ilitek dual touch panel 313 - Ilitek dual touch panel
313 - IrTouch Infrared USB panels 314 - IrTouch Infrared USB panels
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index cc52faa9d87a..5ba23fbfc5a7 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1374,6 +1374,7 @@ static const struct hid_device_id hid_have_special_driver[] = {
1374 { HID_USB_DEVICE(USB_VENDOR_ID_GAMERON, USB_DEVICE_ID_GAMERON_DUAL_PSX_ADAPTOR) }, 1374 { HID_USB_DEVICE(USB_VENDOR_ID_GAMERON, USB_DEVICE_ID_GAMERON_DUAL_PSX_ADAPTOR) },
1375 { HID_USB_DEVICE(USB_VENDOR_ID_GAMERON, USB_DEVICE_ID_GAMERON_DUAL_PCS_ADAPTOR) }, 1375 { HID_USB_DEVICE(USB_VENDOR_ID_GAMERON, USB_DEVICE_ID_GAMERON_DUAL_PCS_ADAPTOR) },
1376 { HID_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH, USB_DEVICE_ID_GENERAL_TOUCH_WIN7_TWOFINGERS) }, 1376 { HID_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH, USB_DEVICE_ID_GENERAL_TOUCH_WIN7_TWOFINGERS) },
1377 { HID_USB_DEVICE(USB_VENDOR_ID_GOODTOUCH, USB_DEVICE_ID_GOODTOUCH_000f) },
1377 { HID_USB_DEVICE(USB_VENDOR_ID_GREENASIA, 0x0003) }, 1378 { HID_USB_DEVICE(USB_VENDOR_ID_GREENASIA, 0x0003) },
1378 { HID_USB_DEVICE(USB_VENDOR_ID_GREENASIA, 0x0012) }, 1379 { HID_USB_DEVICE(USB_VENDOR_ID_GREENASIA, 0x0012) },
1379 { HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE) }, 1380 { HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE) },
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index e9b8004e99b9..5ad823528e24 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -258,6 +258,9 @@
258#define USB_DEVICE_ID_0_8_8_IF_KIT 0x0053 258#define USB_DEVICE_ID_0_8_8_IF_KIT 0x0053
259#define USB_DEVICE_ID_PHIDGET_MOTORCONTROL 0x0058 259#define USB_DEVICE_ID_PHIDGET_MOTORCONTROL 0x0058
260 260
261#define USB_VENDOR_ID_GOODTOUCH 0x1aad
262#define USB_DEVICE_ID_GOODTOUCH_000f 0x000f
263
261#define USB_VENDOR_ID_GOTOP 0x08f2 264#define USB_VENDOR_ID_GOTOP 0x08f2
262#define USB_DEVICE_ID_SUPER_Q2 0x007f 265#define USB_DEVICE_ID_SUPER_Q2 0x007f
263#define USB_DEVICE_ID_GOGOPEN 0x00ce 266#define USB_DEVICE_ID_GOGOPEN 0x00ce
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index af8789a8138d..76ef60db15cc 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -609,6 +609,11 @@ static const struct hid_device_id mt_devices[] = {
609 HID_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH, 609 HID_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH,
610 USB_DEVICE_ID_GENERAL_TOUCH_WIN7_TWOFINGERS) }, 610 USB_DEVICE_ID_GENERAL_TOUCH_WIN7_TWOFINGERS) },
611 611
612 /* GoodTouch panels */
613 { .driver_data = MT_CLS_DEFAULT,
614 HID_USB_DEVICE(USB_VENDOR_ID_GOODTOUCH,
615 USB_DEVICE_ID_GOODTOUCH_000f) },
616
612 /* Ilitek dual touch panel */ 617 /* Ilitek dual touch panel */
613 { .driver_data = MT_CLS_DEFAULT, 618 { .driver_data = MT_CLS_DEFAULT,
614 HID_USB_DEVICE(USB_VENDOR_ID_ILITEK, 619 HID_USB_DEVICE(USB_VENDOR_ID_ILITEK,