summaryrefslogtreecommitdiffstats
path: root/drivers/hid
diff options
context:
space:
mode:
authorBenjamin Tissoires <benjamin.tissoires@enac.fr>2012-03-06 10:53:45 +0100
committerJiri Kosina <jkosina@suse.cz>2012-03-06 14:09:24 +0100
commit841cb1570d2c9eed4496ac9ce53c4fd4ae66ebfc (patch)
tree62b7d1521f0170f031bc13d73c2b2da34bf75e7a /drivers/hid
parent2258e863b451be319d374f89688000ab858b13c3 (diff)
downloadlinux-stable-841cb1570d2c9eed4496ac9ce53c4fd4ae66ebfc.tar.gz
linux-stable-841cb1570d2c9eed4496ac9ce53c4fd4ae66ebfc.tar.bz2
linux-stable-841cb1570d2c9eed4496ac9ce53c4fd4ae66ebfc.zip
HID: multitouch: add support for Atmel maXTouch 03eb:2118
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@enac.fr> Acked-by: Henrik Rydberg <rydberg@euromail.se> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid')
-rw-r--r--drivers/hid/hid-ids.h1
-rw-r--r--drivers/hid/hid-multitouch.c3
2 files changed, 4 insertions, 0 deletions
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 12b6c49359c8..5cb1d63a2a38 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -149,6 +149,7 @@
#define USB_VENDOR_ID_ATMEL 0x03eb
#define USB_DEVICE_ID_ATMEL_MULTITOUCH 0x211c
+#define USB_DEVICE_ID_ATMEL_MXT_DIGITIZER 0x2118
#define USB_VENDOR_ID_AVERMEDIA 0x07ca
#define USB_DEVICE_ID_AVER_FM_MR800 0xb800
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index 09e42ef60d6e..03990a8bb827 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -743,6 +743,9 @@ static const struct hid_device_id mt_devices[] = {
{ .driver_data = MT_CLS_SERIAL,
HID_USB_DEVICE(USB_VENDOR_ID_ATMEL,
USB_DEVICE_ID_ATMEL_MULTITOUCH) },
+ { .driver_data = MT_CLS_SERIAL,
+ HID_USB_DEVICE(USB_VENDOR_ID_ATMEL,
+ USB_DEVICE_ID_ATMEL_MXT_DIGITIZER) },
/* Cando panels */
{ .driver_data = MT_CLS_DUAL_INRANGE_CONTACTNUMBER,