[086/129] HID: multitouch: add support of Atmel multitouch panels
From: Greg KH <gregkh@suse.de>
Date: 2012-01-24 02:46:44
Also in:
lkml
3.2-stable review patch. If anyone has any objections, please let me know. ------------------ Content-Length: 1598 Lines: 52 From: Benjamin Tissoires <redacted> commit b105712469d957cf1ab223c1ea72b7ba88edb926 upstream. Signed-off-by: Benjamin Tissoires <redacted> Acked-by: Henrik Rydberg <redacted> Signed-off-by: Jiri Kosina <redacted> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- drivers/hid/Kconfig | 1 + drivers/hid/hid-ids.h | 3 +++ drivers/hid/hid-multitouch.c | 5 +++++ 3 files changed, 9 insertions(+)
--- a/drivers/hid/Kconfig
+++ b/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 --- a/drivers/hid/hid-ids.h +++ b/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 --- a/drivers/hid/hid-multitouch.c +++ b/drivers/hid/hid-multitouch.c
@@ -615,6 +615,11 @@ static const struct hid_device_id mt_dev 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,