aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hid/hid-multitouch.c
diff options
context:
space:
mode:
authorBenjamin Tissoires <benjamin.tissoires@enac.fr>2011-03-18 09:27:53 -0400
committerJiri Kosina <jkosina@suse.cz>2011-03-21 12:05:02 -0400
commit043b403aede4a528ed99ceaf050f567f1283a23e (patch)
treec3d67092fcba29716fdd7481968d8f9449127f35 /drivers/hid/hid-multitouch.c
parent9498f954a4ec389806333041a1018909c6fe0518 (diff)
HID: hid-multitouch: migrate support for Stantum panels to the unified driver.
This patch merges hid-stantum to the generic multitouch driver. Signed-off-by: Benjamin Tissoires <benjamin.tissoires@enac.fr> Reviewed-by: Stéphane Chatty <chatty@enac.fr> Reviewed-by: Henrik Rydberg <rydberg@euromail.se> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/hid-multitouch.c')
-rw-r--r--drivers/hid/hid-multitouch.c15
1 files changed, 15 insertions, 0 deletions
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index b9f9eeceaa98..5983e5559e81 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -79,6 +79,7 @@ struct mt_class {
79#define MT_CLS_DUAL_INRANGE_CONTACTNUMBER 3 79#define MT_CLS_DUAL_INRANGE_CONTACTNUMBER 3
80#define MT_CLS_CYPRESS 4 80#define MT_CLS_CYPRESS 4
81#define MT_CLS_EGALAX 5 81#define MT_CLS_EGALAX 5
82#define MT_CLS_STANTUM 6
82 83
83#define MT_DEFAULT_MAXCONTACT 10 84#define MT_DEFAULT_MAXCONTACT 10
84 85
@@ -138,6 +139,9 @@ struct mt_class mt_classes[] = {
138 .sn_move = 4096, 139 .sn_move = 4096,
139 .sn_pressure = 32, 140 .sn_pressure = 32,
140 }, 141 },
142 { .name = MT_CLS_STANTUM,
143 .quirks = MT_QUIRK_VALID_IS_CONFIDENCE },
144
141 { } 145 { }
142}; 146};
143 147
@@ -552,6 +556,17 @@ static const struct hid_device_id mt_devices[] = {
552 HID_USB_DEVICE(USB_VENDOR_ID_DWAV, 556 HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
553 USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH4) }, 557 USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH4) },
554 558
559 /* Stantum panels */
560 { .driver_data = MT_CLS_STANTUM,
561 HID_USB_DEVICE(USB_VENDOR_ID_STANTUM,
562 USB_DEVICE_ID_MTP)},
563 { .driver_data = MT_CLS_STANTUM,
564 HID_USB_DEVICE(USB_VENDOR_ID_STANTUM,
565 USB_DEVICE_ID_MTP_STM)},
566 { .driver_data = MT_CLS_STANTUM,
567 HID_USB_DEVICE(USB_VENDOR_ID_STANTUM,
568 USB_DEVICE_ID_MTP_SITRONIX)},
569
555 { } 570 { }
556}; 571};
557MODULE_DEVICE_TABLE(hid, mt_devices); 572MODULE_DEVICE_TABLE(hid, mt_devices);