aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hid
diff options
context:
space:
mode:
authorBenjamin Tissoires <benjamin.tissoires@enac.fr>2011-05-19 08:18:14 -0400
committerJiri Kosina <jkosina@suse.cz>2011-05-20 07:35:41 -0400
commit79603dc9a8223856cf3194dcabad32b9828c7be9 (patch)
tree7ab6980e2c7c8199222e2d35b1049498b4550db1 /drivers/hid
parente6aac3427ef03f61e7478514d0648b58359d05d1 (diff)
HID: hid-multitouch: add support for CVTouch panels
This patch introduce support for CVTouch 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 605b69b2a52a..3e14815eba36 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -305,6 +305,7 @@ config HID_MULTITOUCH
305 - 3M PCT touch screens 305 - 3M PCT touch screens
306 - ActionStar dual touch panels 306 - ActionStar dual touch panels
307 - Cando dual touch panel 307 - Cando dual touch panel
308 - CVTouch panels
308 - Cypress TrueTouch panels 309 - Cypress TrueTouch panels
309 - Elo TouchSystems IntelliTouch Plus panels 310 - Elo TouchSystems IntelliTouch Plus panels
310 - Hanvon dual touch panels 311 - Hanvon dual touch panels
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index c2382b6ad2d5..cc52faa9d87a 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1354,6 +1354,7 @@ static const struct hid_device_id hid_have_special_driver[] = {
1354 { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_TACTICAL_PAD) }, 1354 { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_TACTICAL_PAD) },
1355 { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_WIRELESS) }, 1355 { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_WIRELESS) },
1356 { HID_USB_DEVICE(USB_VENDOR_ID_CREATIVELABS, USB_DEVICE_ID_PRODIKEYS_PCMIDI) }, 1356 { HID_USB_DEVICE(USB_VENDOR_ID_CREATIVELABS, USB_DEVICE_ID_PRODIKEYS_PCMIDI) },
1357 { HID_USB_DEVICE(USB_VENDOR_ID_CVTOUCH, USB_DEVICE_ID_CVTOUCH_SCREEN) },
1357 { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_1) }, 1358 { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_1) },
1358 { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_2) }, 1359 { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_2) },
1359 { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_3) }, 1360 { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_3) },
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 0ebb7fa4cbf6..e9b8004e99b9 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -181,6 +181,9 @@
181#define USB_VENDOR_ID_CREATIVELABS 0x041e 181#define USB_VENDOR_ID_CREATIVELABS 0x041e
182#define USB_DEVICE_ID_PRODIKEYS_PCMIDI 0x2801 182#define USB_DEVICE_ID_PRODIKEYS_PCMIDI 0x2801
183 183
184#define USB_VENDOR_ID_CVTOUCH 0x1ff7
185#define USB_DEVICE_ID_CVTOUCH_SCREEN 0x0013
186
184#define USB_VENDOR_ID_CYGNAL 0x10c4 187#define USB_VENDOR_ID_CYGNAL 0x10c4
185#define USB_DEVICE_ID_CYGNAL_RADIO_SI470X 0x818a 188#define USB_DEVICE_ID_CYGNAL_RADIO_SI470X 0x818a
186 189
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index 10a8c760568f..af8789a8138d 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -589,6 +589,11 @@ static const struct hid_device_id mt_devices[] = {
589 HID_USB_DEVICE(USB_VENDOR_ID_CANDO, 589 HID_USB_DEVICE(USB_VENDOR_ID_CANDO,
590 USB_DEVICE_ID_CANDO_MULTI_TOUCH_15_6) }, 590 USB_DEVICE_ID_CANDO_MULTI_TOUCH_15_6) },
591 591
592 /* CVTouch panels */
593 { .driver_data = MT_CLS_DEFAULT,
594 HID_USB_DEVICE(USB_VENDOR_ID_CVTOUCH,
595 USB_DEVICE_ID_CVTOUCH_SCREEN) },
596
592 /* Cypress panel */ 597 /* Cypress panel */
593 { .driver_data = MT_CLS_CYPRESS, 598 { .driver_data = MT_CLS_CYPRESS,
594 HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, 599 HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS,