* [PATCH 1/2] HID: multitouch: add support of Atmel multitouch panels
2011-12-23 14:40 [PATCH 0/2] 3M and Atmel for hid-multitouch Benjamin Tissoires
@ 2011-12-23 14:40 ` Benjamin Tissoires
2011-12-23 18:54 ` Chase Douglas
2011-12-23 14:41 ` [PATCH 2/2] HID: multitouch: add support for 3M 32" Benjamin Tissoires
2011-12-29 10:16 ` [PATCH 0/2] 3M and Atmel for hid-multitouch Henrik Rydberg
2 siblings, 1 reply; 8+ messages in thread
From: Benjamin Tissoires @ 2011-12-23 14:40 UTC (permalink / raw)
To: Dmitry Torokhov, Henrik Rydberg, Benjamin Tissoires, Jiri Kosina,
Stephane Chatty, linux-input, linux-kernel
Cc: Benjamin Tissoires
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@gmail.com>
---
drivers/hid/Kconfig | 1 +
drivers/hid/hid-ids.h | 3 +++
drivers/hid/hid-multitouch.c | 5 +++++
3 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index 5d6eb4e..e95b07c 100644
--- 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
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 96e139f..8705249 100644
--- 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
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index 513329d..d038864 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[] = {
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,
--
1.7.4.4
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH 1/2] HID: multitouch: add support of Atmel multitouch panels
2011-12-23 14:40 ` [PATCH 1/2] HID: multitouch: add support of Atmel multitouch panels Benjamin Tissoires
@ 2011-12-23 18:54 ` Chase Douglas
2011-12-29 18:26 ` Benjamin Tissoires
2012-01-03 13:09 ` Nick Dyer
0 siblings, 2 replies; 8+ messages in thread
From: Chase Douglas @ 2011-12-23 18:54 UTC (permalink / raw)
To: Benjamin Tissoires
Cc: Dmitry Torokhov, Henrik Rydberg, Benjamin Tissoires, Jiri Kosina,
Stephane Chatty, linux-input, linux-kernel
On 12/23/2011 06:40 AM, Benjamin Tissoires wrote:
> Signed-off-by: Benjamin Tissoires <benjamin.tissoires@gmail.com>
> ---
> drivers/hid/Kconfig | 1 +
> drivers/hid/hid-ids.h | 3 +++
> drivers/hid/hid-multitouch.c | 5 +++++
> 3 files changed, 9 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
> index 5d6eb4e..e95b07c 100644
> --- 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
I'm guessing this is different than the Atmel maXTouch chips. If so, can
you figure out a model name so people aren't confused on which driver to
use?
-- Chase
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/2] HID: multitouch: add support of Atmel multitouch panels
2011-12-23 18:54 ` Chase Douglas
@ 2011-12-29 18:26 ` Benjamin Tissoires
2012-01-03 13:09 ` Nick Dyer
1 sibling, 0 replies; 8+ messages in thread
From: Benjamin Tissoires @ 2011-12-29 18:26 UTC (permalink / raw)
To: Chase Douglas
Cc: Dmitry Torokhov, Henrik Rydberg, Jiri Kosina, Stephane Chatty,
linux-input, linux-kernel
Hello Chase,
Well, this is the "Atmel maXTouch Digitizer" found on Samsung "Series
7 Slate" XE700T1A.
Same device here:
http://www.spinics.net/lists/xorg/msg53376.html
Cheers,
and happy new year,
Benjamin
On Fri, Dec 23, 2011 at 19:54, Chase Douglas <chasedouglas@gmail.com> wrote:
> On 12/23/2011 06:40 AM, Benjamin Tissoires wrote:
>> Signed-off-by: Benjamin Tissoires <benjamin.tissoires@gmail.com>
>> ---
>> drivers/hid/Kconfig | 1 +
>> drivers/hid/hid-ids.h | 3 +++
>> drivers/hid/hid-multitouch.c | 5 +++++
>> 3 files changed, 9 insertions(+), 0 deletions(-)
>>
>> diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
>> index 5d6eb4e..e95b07c 100644
>> --- 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
>
> I'm guessing this is different than the Atmel maXTouch chips. If so, can
> you figure out a model name so people aren't confused on which driver to
> use?
>
> -- Chase
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/2] HID: multitouch: add support of Atmel multitouch panels
2011-12-23 18:54 ` Chase Douglas
2011-12-29 18:26 ` Benjamin Tissoires
@ 2012-01-03 13:09 ` Nick Dyer
1 sibling, 0 replies; 8+ messages in thread
From: Nick Dyer @ 2012-01-03 13:09 UTC (permalink / raw)
To: Chase Douglas
Cc: Benjamin Tissoires, Dmitry Torokhov, Henrik Rydberg,
Benjamin Tissoires, Jiri Kosina, Stephane Chatty, linux-input,
linux-kernel
Chase Douglas wrote:
> On 12/23/2011 06:40 AM, Benjamin Tissoires wrote:
>> Signed-off-by: Benjamin Tissoires<benjamin.tissoires@gmail.com>
>> ---
>> drivers/hid/Kconfig | 1 +
>> drivers/hid/hid-ids.h | 3 +++
>> drivers/hid/hid-multitouch.c | 5 +++++
>> 3 files changed, 9 insertions(+), 0 deletions(-)
>>
>> diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
>> index 5d6eb4e..e95b07c 100644
>> --- 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
>
> I'm guessing this is different than the Atmel maXTouch chips. If so, can
> you figure out a model name so people aren't confused on which driver to
> use?
It is in fact a maXTouch chip - there are several different chips which
are able to register as a USB digitizer device using that VID/PID.
--
Nick Dyer
Software Engineer, ITDev Ltd
Hardware and Software Development Consultancy
Website: http://www.itdev.co.uk
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 2/2] HID: multitouch: add support for 3M 32"
2011-12-23 14:40 [PATCH 0/2] 3M and Atmel for hid-multitouch Benjamin Tissoires
2011-12-23 14:40 ` [PATCH 1/2] HID: multitouch: add support of Atmel multitouch panels Benjamin Tissoires
@ 2011-12-23 14:41 ` Benjamin Tissoires
2011-12-29 10:16 ` [PATCH 0/2] 3M and Atmel for hid-multitouch Henrik Rydberg
2 siblings, 0 replies; 8+ messages in thread
From: Benjamin Tissoires @ 2011-12-23 14:41 UTC (permalink / raw)
To: Dmitry Torokhov, Henrik Rydberg, Benjamin Tissoires, Jiri Kosina,
Stephane Chatty, linux-input, linux-kernel
Cc: Benjamin Tissoires
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@gmail.com>
---
drivers/hid/hid-ids.h | 1 +
drivers/hid/hid-multitouch.c | 3 +++
2 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 8705249..efd2fda 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -21,6 +21,7 @@
#define USB_VENDOR_ID_3M 0x0596
#define USB_DEVICE_ID_3M1968 0x0500
#define USB_DEVICE_ID_3M2256 0x0502
+#define USB_DEVICE_ID_3M3266 0x0506
#define USB_VENDOR_ID_A4TECH 0x09da
#define USB_DEVICE_ID_A4TECH_WCP32PU 0x0006
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index d038864..c3154af 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -661,6 +661,9 @@ static const struct hid_device_id mt_devices[] = {
{ .driver_data = MT_CLS_3M,
HID_USB_DEVICE(USB_VENDOR_ID_3M,
USB_DEVICE_ID_3M2256) },
+ { .driver_data = MT_CLS_3M,
+ HID_USB_DEVICE(USB_VENDOR_ID_3M,
+ USB_DEVICE_ID_3M3266) },
/* ActionStar panels */
{ .driver_data = MT_CLS_DEFAULT,
--
1.7.4.4
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH 0/2] 3M and Atmel for hid-multitouch
2011-12-23 14:40 [PATCH 0/2] 3M and Atmel for hid-multitouch Benjamin Tissoires
2011-12-23 14:40 ` [PATCH 1/2] HID: multitouch: add support of Atmel multitouch panels Benjamin Tissoires
2011-12-23 14:41 ` [PATCH 2/2] HID: multitouch: add support for 3M 32" Benjamin Tissoires
@ 2011-12-29 10:16 ` Henrik Rydberg
2012-01-02 10:12 ` Jiri Kosina
2 siblings, 1 reply; 8+ messages in thread
From: Henrik Rydberg @ 2011-12-29 10:16 UTC (permalink / raw)
To: Benjamin Tissoires
Cc: Dmitry Torokhov, Benjamin Tissoires, Jiri Kosina, Stephane Chatty,
linux-input, linux-kernel
Hi Benjamin,
> These are 2 VID/PID for hid-multitouch.
Looking good, thank you.
Acked-by: Henrik Rydberg <rydberg@euromail.se>
Happy New Year,
Henrik
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH 0/2] 3M and Atmel for hid-multitouch
2011-12-29 10:16 ` [PATCH 0/2] 3M and Atmel for hid-multitouch Henrik Rydberg
@ 2012-01-02 10:12 ` Jiri Kosina
0 siblings, 0 replies; 8+ messages in thread
From: Jiri Kosina @ 2012-01-02 10:12 UTC (permalink / raw)
To: Henrik Rydberg
Cc: Benjamin Tissoires, Dmitry Torokhov, Benjamin Tissoires,
Stephane Chatty, linux-input, linux-kernel
On Thu, 29 Dec 2011, Henrik Rydberg wrote:
> > These are 2 VID/PID for hid-multitouch.
>
> Looking good, thank you.
>
> Acked-by: Henrik Rydberg <rydberg@euromail.se>
Applied, thanks guys.
--
Jiri Kosina
SUSE Labs
^ permalink raw reply [flat|nested] 8+ messages in thread