aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorBenjamin Tissoires <benjamin.tissoires@enac.fr>2011-05-18 09:27:24 -0400
committerJiri Kosina <jkosina@suse.cz>2011-05-18 09:35:51 -0400
commitdf167c4a0d68a9dbde044a39a77f255ac666f93e (patch)
tree541384ae2e8f2f60d9799bc25ab7ffd3efb22431 /drivers
parent4e61f0d75aa86c9e59451f6bcffcdceb355b4fc4 (diff)
HID: hid-multitouch: Add support for Lumio panels
This patch enables support for Lumio optical devices. Signed-off-by: Benjamin Tissoires <benjamin.tissoires@enac.fr> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers')
-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 d9635d6a907a..5a54b1312abf 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -308,6 +308,7 @@ config HID_MULTITOUCH
308 - Hanvon dual touch panels 308 - Hanvon dual touch panels
309 - Ilitek dual touch panel 309 - Ilitek dual touch panel
310 - IrTouch Infrared USB panels 310 - IrTouch Infrared USB panels
311 - Lumio CrystalTouch panels
311 - MosArt dual-touch panels 312 - MosArt dual-touch panels
312 - PenMount dual touch panels 313 - PenMount dual touch panels
313 - Pixcir dual touch panels 314 - Pixcir dual touch panels
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index c0ea857ed429..3dad069e142a 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1410,6 +1410,7 @@ static const struct hid_device_id hid_have_special_driver[] = {
1410 { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_RUMBLEPAD2) }, 1410 { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_RUMBLEPAD2) },
1411 { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_SPACETRAVELLER) }, 1411 { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_SPACETRAVELLER) },
1412 { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_SPACENAVIGATOR) }, 1412 { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_SPACENAVIGATOR) },
1413 { HID_USB_DEVICE(USB_VENDOR_ID_LUMIO, USB_DEVICE_ID_CRYSTALTOUCH) },
1413 { HID_USB_DEVICE(USB_VENDOR_ID_MICROCHIP, USB_DEVICE_ID_PICOLCD) }, 1414 { HID_USB_DEVICE(USB_VENDOR_ID_MICROCHIP, USB_DEVICE_ID_PICOLCD) },
1414 { HID_USB_DEVICE(USB_VENDOR_ID_MICROCHIP, USB_DEVICE_ID_PICOLCD_BOOTLOADER) }, 1415 { HID_USB_DEVICE(USB_VENDOR_ID_MICROCHIP, USB_DEVICE_ID_PICOLCD_BOOTLOADER) },
1415 { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_SIDEWINDER_GV) }, 1416 { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_SIDEWINDER_GV) },
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 0f29b3facca1..bfbc0d258851 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -410,6 +410,9 @@
410#define USB_DEVICE_ID_DINOVO_MINI 0xc71f 410#define USB_DEVICE_ID_DINOVO_MINI 0xc71f
411#define USB_DEVICE_ID_LOGITECH_MOMO_WHEEL2 0xca03 411#define USB_DEVICE_ID_LOGITECH_MOMO_WHEEL2 0xca03
412 412
413#define USB_VENDOR_ID_LUMIO 0x202e
414#define USB_DEVICE_ID_CRYSTALTOUCH 0x0006
415
413#define USB_VENDOR_ID_MCC 0x09db 416#define USB_VENDOR_ID_MCC 0x09db
414#define USB_DEVICE_ID_MCC_PMD1024LS 0x0076 417#define USB_DEVICE_ID_MCC_PMD1024LS 0x0076
415#define USB_DEVICE_ID_MCC_PMD1208LS 0x007a 418#define USB_DEVICE_ID_MCC_PMD1208LS 0x007a
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index b21251b43a35..ef33e2d5af87 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -599,6 +599,11 @@ static const struct hid_device_id mt_devices[] = {
599 HID_USB_DEVICE(USB_VENDOR_ID_IRTOUCHSYSTEMS, 599 HID_USB_DEVICE(USB_VENDOR_ID_IRTOUCHSYSTEMS,
600 USB_DEVICE_ID_IRTOUCH_INFRARED_USB) }, 600 USB_DEVICE_ID_IRTOUCH_INFRARED_USB) },
601 601
602 /* Lumio panels */
603 { .driver_data = MT_CLS_CONFIDENCE_MINUS_ONE,
604 HID_USB_DEVICE(USB_VENDOR_ID_LUMIO,
605 USB_DEVICE_ID_CRYSTALTOUCH) },
606
602 /* MosArt panels */ 607 /* MosArt panels */
603 { .driver_data = MT_CLS_CONFIDENCE_MINUS_ONE, 608 { .driver_data = MT_CLS_CONFIDENCE_MINUS_ONE,
604 HID_USB_DEVICE(USB_VENDOR_ID_ASUS, 609 HID_USB_DEVICE(USB_VENDOR_ID_ASUS,