aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorSteffen Trumtrar <s.trumtrar@pengutronix.de>2013-05-16 05:49:41 -0400
committerJiri Kosina <jkosina@suse.cz>2013-05-16 07:28:16 -0400
commit0b7ddda69263c305375ab88d4272c4a548bf66c0 (patch)
tree4c5beea0e70ef28d9d9997e79d4d7299e1364c06 /drivers
parentf755407dd19072b7d20719bc5454caed9ab41cc1 (diff)
HID: multitouch: add support for Data Modul easyMaxTouch
Add vendor ID for Data Modul and their easyMaxTouch device. The device has to be configured to multitouch mode prior to using this driver. Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/hid/hid-ids.h3
-rw-r--r--drivers/hid/hid-multitouch.c5
2 files changed, 8 insertions, 0 deletions
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 38535c9243d5..0b4598ac43d1 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -248,6 +248,9 @@
248#define USB_DEVICE_ID_CYPRESS_BARCODE_4 0xed81 248#define USB_DEVICE_ID_CYPRESS_BARCODE_4 0xed81
249#define USB_DEVICE_ID_CYPRESS_TRUETOUCH 0xc001 249#define USB_DEVICE_ID_CYPRESS_TRUETOUCH 0xc001
250 250
251#define USB_VENDOR_ID_DATA_MODUL 0x7374
252#define USB_VENDOR_ID_DATA_MODUL_EASYMAXTOUCH 0x1201
253
251#define USB_VENDOR_ID_DEALEXTREAME 0x10c5 254#define USB_VENDOR_ID_DEALEXTREAME 0x10c5
252#define USB_DEVICE_ID_DEALEXTREAME_RADIO_SI4701 0x819a 255#define USB_DEVICE_ID_DEALEXTREAME_RADIO_SI4701 0x819a
253 256
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index dc3ae5c56f56..1bea65791e45 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -1108,6 +1108,11 @@ static const struct hid_device_id mt_devices[] = {
1108 HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, 1108 HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS,
1109 USB_DEVICE_ID_CYPRESS_TRUETOUCH) }, 1109 USB_DEVICE_ID_CYPRESS_TRUETOUCH) },
1110 1110
1111 /* Data Modul easyMaxTouch */
1112 { .driver_data = MT_CLS_DEFAULT,
1113 MT_USB_DEVICE(USB_VENDOR_ID_DATA_MODUL,
1114 USB_VENDOR_ID_DATA_MODUL_EASYMAXTOUCH) },
1115
1111 /* eGalax devices (resistive) */ 1116 /* eGalax devices (resistive) */
1112 { .driver_data = MT_CLS_EGALAX, 1117 { .driver_data = MT_CLS_EGALAX,
1113 MT_USB_DEVICE(USB_VENDOR_ID_DWAV, 1118 MT_USB_DEVICE(USB_VENDOR_ID_DWAV,