From f17bf0163188ea3b0293129020cd6f7a873141fb Mon Sep 17 00:00:00 2001
From: Benjamin Tissoires <benjamin.tissoires@gmail.com>
Date: Fri, 23 Dec 2011 15:40:59 +0100
Subject: [PATCH] --- yaml --- r: 282303 b: refs/heads/master c:
 b105712469d957cf1ab223c1ea72b7ba88edb926 h: refs/heads/master i:   282301:
 27ee8e37564c637b2cd42dbe62fd9b7b98d2e239   282299:
 0dd37baed731295db4d0c8d162eb2a6155209e6c   282295:
 f349f3bc11bf4984bbea6f0f2327979da1893a43   282287:
 533775d87b4ee74a94ba985e92f0c90c8abd4395   282271:
 aaffec497f1db26d9f1f13b5742b672ffd3e5901   282239:
 baf507b492c533d97b2a4d57220ad1c37fc8d287 v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/hid/Kconfig          | 1 +
 trunk/drivers/hid/hid-ids.h        | 3 +++
 trunk/drivers/hid/hid-multitouch.c | 5 +++++
 4 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 1cb580126afe..64357a1ec7f4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b7ea95ff9baab144dacdc30d752307938c5ab6bf
+refs/heads/master: b105712469d957cf1ab223c1ea72b7ba88edb926
diff --git a/trunk/drivers/hid/Kconfig b/trunk/drivers/hid/Kconfig
index 5d6eb4e5af30..e95b07cff038 100644
--- a/trunk/drivers/hid/Kconfig
+++ b/trunk/drivers/hid/Kconfig
@@ -335,6 +335,7 @@ config HID_MULTITOUCH
 	  Say Y here if you have one of the following devices:
 	  - 3M PCT touch screens
 	  - ActionStar dual touch panels
+	  - Atmel panels
 	  - Cando dual touch panels
 	  - Chunghwa panels
 	  - CVTouch panels
diff --git a/trunk/drivers/hid/hid-ids.h b/trunk/drivers/hid/hid-ids.h
index 96e139f2351b..870524948d7b 100644
--- a/trunk/drivers/hid/hid-ids.h
+++ b/trunk/drivers/hid/hid-ids.h
@@ -145,6 +145,9 @@
 #define USB_DEVICE_ID_ATEN_4PORTKVM	0x2205
 #define USB_DEVICE_ID_ATEN_4PORTKVMC	0x2208
 
+#define USB_VENDOR_ID_ATMEL		0x03eb
+#define USB_DEVICE_ID_ATMEL_MULTITOUCH	0x211c
+
 #define USB_VENDOR_ID_AVERMEDIA		0x07ca
 #define USB_DEVICE_ID_AVER_FM_MR800	0xb800
 
diff --git a/trunk/drivers/hid/hid-multitouch.c b/trunk/drivers/hid/hid-multitouch.c
index 513329d9833f..d03886438924 100644
--- a/trunk/drivers/hid/hid-multitouch.c
+++ b/trunk/drivers/hid/hid-multitouch.c
@@ -667,6 +667,11 @@ static const struct hid_device_id mt_devices[] = {
 		HID_USB_DEVICE(USB_VENDOR_ID_ACTIONSTAR,
 			USB_DEVICE_ID_ACTIONSTAR_1011) },
 
+	/* Atmel panels */
+	{ .driver_data = MT_CLS_SERIAL,
+		HID_USB_DEVICE(USB_VENDOR_ID_ATMEL,
+			USB_DEVICE_ID_ATMEL_MULTITOUCH) },
+
 	/* Cando panels */
 	{ .driver_data = MT_CLS_DUAL_INRANGE_CONTACTNUMBER,
 		HID_USB_DEVICE(USB_VENDOR_ID_CANDO,