aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorBenjamin Tissoires <benjamin.tissoires@gmail.com>2011-12-23 09:40:59 -0500
committerJiri Kosina <jkosina@suse.cz>2012-01-02 05:10:36 -0500
commitb105712469d957cf1ab223c1ea72b7ba88edb926 (patch)
tree3a9887fe79ee8c9946a5346475c8ccc5ef27390f /drivers
parentb7ea95ff9baab144dacdc30d752307938c5ab6bf (diff)
HID: multitouch: add support of Atmel multitouch panels
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@gmail.com> Acked-by: Henrik Rydberg <rydberg@euromail.se> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/hid/Kconfig1
-rw-r--r--drivers/hid/hid-ids.h3
-rw-r--r--drivers/hid/hid-multitouch.c5
3 files changed, 9 insertions, 0 deletions
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index 5d6eb4e5af30..e95b07cff038 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -335,6 +335,7 @@ config HID_MULTITOUCH
335 Say Y here if you have one of the following devices: 335 Say Y here if you have one of the following devices:
336 - 3M PCT touch screens 336 - 3M PCT touch screens
337 - ActionStar dual touch panels 337 - ActionStar dual touch panels
338 - Atmel panels
338 - Cando dual touch panels 339 - Cando dual touch panels
339 - Chunghwa panels 340 - Chunghwa panels
340 - CVTouch panels 341 - CVTouch panels
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 96e139f2351b..870524948d7b 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -145,6 +145,9 @@
145#define USB_DEVICE_ID_ATEN_4PORTKVM 0x2205 145#define USB_DEVICE_ID_ATEN_4PORTKVM 0x2205
146#define USB_DEVICE_ID_ATEN_4PORTKVMC 0x2208 146#define USB_DEVICE_ID_ATEN_4PORTKVMC 0x2208
147 147
148#define USB_VENDOR_ID_ATMEL 0x03eb
149#define USB_DEVICE_ID_ATMEL_MULTITOUCH 0x211c
150
148#define USB_VENDOR_ID_AVERMEDIA 0x07ca 151#define USB_VENDOR_ID_AVERMEDIA 0x07ca
149#define USB_DEVICE_ID_AVER_FM_MR800 0xb800 152#define USB_DEVICE_ID_AVER_FM_MR800 0xb800
150 153
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index 513329d9833f..d03886438924 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -667,6 +667,11 @@ static const struct hid_device_id mt_devices[] = {
667 HID_USB_DEVICE(USB_VENDOR_ID_ACTIONSTAR, 667 HID_USB_DEVICE(USB_VENDOR_ID_ACTIONSTAR,
668 USB_DEVICE_ID_ACTIONSTAR_1011) }, 668 USB_DEVICE_ID_ACTIONSTAR_1011) },
669 669
670 /* Atmel panels */
671 { .driver_data = MT_CLS_SERIAL,
672 HID_USB_DEVICE(USB_VENDOR_ID_ATMEL,
673 USB_DEVICE_ID_ATMEL_MULTITOUCH) },
674
670 /* Cando panels */ 675 /* Cando panels */
671 { .driver_data = MT_CLS_DUAL_INRANGE_CONTACTNUMBER, 676 { .driver_data = MT_CLS_DUAL_INRANGE_CONTACTNUMBER,
672 HID_USB_DEVICE(USB_VENDOR_ID_CANDO, 677 HID_USB_DEVICE(USB_VENDOR_ID_CANDO,