* [PATCH] Input: HID-multitouch: Add egalax ID for Acer Iconia W500
@ 2011-09-14 3:15 Marek Vasut
2011-09-16 6:28 ` Dmitry Torokhov
0 siblings, 1 reply; 14+ messages in thread
From: Marek Vasut @ 2011-09-14 3:15 UTC (permalink / raw)
To: linux-input; +Cc: dmitry.torokhov, Marek Vasut
This patch adds USB ID for the touchpanel in Acer Iconia W500. The panel
supports up to five fingers, therefore the need for a new addition of panel
types.
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
---
drivers/hid/hid-core.c | 1 +
drivers/hid/hid-ids.h | 1 +
drivers/hid/hid-multitouch.c | 12 ++++++++++++
3 files changed, 14 insertions(+), 0 deletions(-)
NOTE: That checkpatch warning is there because I followed the pattern in
hid-core.c
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index 242353d..6600ac7 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1377,6 +1377,7 @@ static const struct hid_device_id hid_have_special_driver[] = {
{ HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH2) },
{ HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH3) },
{ HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH4) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH5) },
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_BM084) },
{ HID_USB_DEVICE(USB_VENDOR_ID_ELO, USB_DEVICE_ID_ELO_TS2515) },
{ HID_USB_DEVICE(USB_VENDOR_ID_EMS, USB_DEVICE_ID_EMS_TRIO_LINKER_PLUS_II) },
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 7484e1b..c2e9369 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -225,6 +225,7 @@
#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH2 0x72a1
#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH3 0x480e
#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH4 0x726b
+#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH5 0x7302
#define USB_VENDOR_ID_ELECOM 0x056e
#define USB_DEVICE_ID_ELECOM_BM084 0x0061
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index 58d0e7a..35c53db 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -96,6 +96,7 @@ struct mt_class {
#define MT_CLS_3M 0x0101
#define MT_CLS_CYPRESS 0x0102
#define MT_CLS_EGALAX 0x0103
+#define MT_CLS_EGALAX_5FINGER 0x0104
#define MT_DEFAULT_MAXCONTACT 10
@@ -173,6 +174,14 @@ struct mt_class mt_classes[] = {
.sn_move = 4096,
.sn_pressure = 32,
},
+ { .name = MT_CLS_EGALAX_5FINGER,
+ .quirks = MT_QUIRK_SLOT_IS_CONTACTID |
+ MT_QUIRK_VALID_IS_INRANGE |
+ MT_QUIRK_EGALAX_XYZ_FIXUP,
+ .maxcontacts = 5,
+ .sn_move = 4096,
+ .sn_pressure = 32,
+ },
{ }
};
@@ -646,6 +655,9 @@ static const struct hid_device_id mt_devices[] = {
{ .driver_data = MT_CLS_EGALAX,
HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH4) },
+ { .driver_data = MT_CLS_EGALAX_5FINGER,
+ HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
+ USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH5) },
/* Elo TouchSystems IntelliTouch Plus panel */
{ .driver_data = MT_CLS_DUAL_NSMU_CONTACTID,
--
1.7.5.4
^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [PATCH] Input: HID-multitouch: Add egalax ID for Acer Iconia W500
2011-09-14 3:15 Marek Vasut
@ 2011-09-16 6:28 ` Dmitry Torokhov
2011-09-16 9:23 ` Benjamin Tissoires
0 siblings, 1 reply; 14+ messages in thread
From: Dmitry Torokhov @ 2011-09-16 6:28 UTC (permalink / raw)
To: Marek Vasut; +Cc: linux-input, Jiri Kosina
Hi Marek,
On Wed, Sep 14, 2011 at 05:15:47AM +0200, Marek Vasut wrote:
> This patch adds USB ID for the touchpanel in Acer Iconia W500. The panel
> supports up to five fingers, therefore the need for a new addition of panel
> types.
>
> Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
This should actually go to Jiri (CCed).
Thanks.
> ---
> drivers/hid/hid-core.c | 1 +
> drivers/hid/hid-ids.h | 1 +
> drivers/hid/hid-multitouch.c | 12 ++++++++++++
> 3 files changed, 14 insertions(+), 0 deletions(-)
>
> NOTE: That checkpatch warning is there because I followed the pattern in
> hid-core.c
>
> diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
> index 242353d..6600ac7 100644
> --- a/drivers/hid/hid-core.c
> +++ b/drivers/hid/hid-core.c
> @@ -1377,6 +1377,7 @@ static const struct hid_device_id hid_have_special_driver[] = {
> { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH2) },
> { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH3) },
> { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH4) },
> + { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH5) },
> { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_BM084) },
> { HID_USB_DEVICE(USB_VENDOR_ID_ELO, USB_DEVICE_ID_ELO_TS2515) },
> { HID_USB_DEVICE(USB_VENDOR_ID_EMS, USB_DEVICE_ID_EMS_TRIO_LINKER_PLUS_II) },
> diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
> index 7484e1b..c2e9369 100644
> --- a/drivers/hid/hid-ids.h
> +++ b/drivers/hid/hid-ids.h
> @@ -225,6 +225,7 @@
> #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH2 0x72a1
> #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH3 0x480e
> #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH4 0x726b
> +#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH5 0x7302
>
> #define USB_VENDOR_ID_ELECOM 0x056e
> #define USB_DEVICE_ID_ELECOM_BM084 0x0061
> diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
> index 58d0e7a..35c53db 100644
> --- a/drivers/hid/hid-multitouch.c
> +++ b/drivers/hid/hid-multitouch.c
> @@ -96,6 +96,7 @@ struct mt_class {
> #define MT_CLS_3M 0x0101
> #define MT_CLS_CYPRESS 0x0102
> #define MT_CLS_EGALAX 0x0103
> +#define MT_CLS_EGALAX_5FINGER 0x0104
>
> #define MT_DEFAULT_MAXCONTACT 10
>
> @@ -173,6 +174,14 @@ struct mt_class mt_classes[] = {
> .sn_move = 4096,
> .sn_pressure = 32,
> },
> + { .name = MT_CLS_EGALAX_5FINGER,
> + .quirks = MT_QUIRK_SLOT_IS_CONTACTID |
> + MT_QUIRK_VALID_IS_INRANGE |
> + MT_QUIRK_EGALAX_XYZ_FIXUP,
> + .maxcontacts = 5,
> + .sn_move = 4096,
> + .sn_pressure = 32,
> + },
>
> { }
> };
> @@ -646,6 +655,9 @@ static const struct hid_device_id mt_devices[] = {
> { .driver_data = MT_CLS_EGALAX,
> HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
> USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH4) },
> + { .driver_data = MT_CLS_EGALAX_5FINGER,
> + HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
> + USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH5) },
>
> /* Elo TouchSystems IntelliTouch Plus panel */
> { .driver_data = MT_CLS_DUAL_NSMU_CONTACTID,
> --
> 1.7.5.4
>
--
Dmitry
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH] Input: HID-multitouch: Add egalax ID for Acer Iconia W500
2011-09-16 6:28 ` Dmitry Torokhov
@ 2011-09-16 9:23 ` Benjamin Tissoires
2011-09-16 9:48 ` Henrik Rydberg
0 siblings, 1 reply; 14+ messages in thread
From: Benjamin Tissoires @ 2011-09-16 9:23 UTC (permalink / raw)
To: Dmitry Torokhov
Cc: Marek Vasut, linux-input, Jiri Kosina, Stéphane Chatty,
Henrik Rydberg
Hello Marek,
it's commonly use to also add the authors (me and Stéphane) and the
multitouch maintainer (Henrik). Working in hid-multitouch requires
adding a lot of people in cc... ;-)
Globally, the patch is clean. I don't really like it because a cleaner
way would be to just remove the field .maxcontacts in MT_CLS_EGALAX.
This would require tests from all the different eGalax owners, and
personally, I don't have the time to lead them.
So:
Reviewed-by: Benjamin Tissoires <benjamin.tissoires@gmail.com>
Cheers,
Benjamin
On Fri, Sep 16, 2011 at 08:28, Dmitry Torokhov
<dmitry.torokhov@gmail.com> wrote:
> Hi Marek,
>
> On Wed, Sep 14, 2011 at 05:15:47AM +0200, Marek Vasut wrote:
>> This patch adds USB ID for the touchpanel in Acer Iconia W500. The panel
>> supports up to five fingers, therefore the need for a new addition of panel
>> types.
>>
>> Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
>
> This should actually go to Jiri (CCed).
>
> Thanks.
>
>> ---
>> drivers/hid/hid-core.c | 1 +
>> drivers/hid/hid-ids.h | 1 +
>> drivers/hid/hid-multitouch.c | 12 ++++++++++++
>> 3 files changed, 14 insertions(+), 0 deletions(-)
>>
>> NOTE: That checkpatch warning is there because I followed the pattern in
>> hid-core.c
>>
>> diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
>> index 242353d..6600ac7 100644
>> --- a/drivers/hid/hid-core.c
>> +++ b/drivers/hid/hid-core.c
>> @@ -1377,6 +1377,7 @@ static const struct hid_device_id hid_have_special_driver[] = {
>> { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH2) },
>> { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH3) },
>> { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH4) },
>> + { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH5) },
>> { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_BM084) },
>> { HID_USB_DEVICE(USB_VENDOR_ID_ELO, USB_DEVICE_ID_ELO_TS2515) },
>> { HID_USB_DEVICE(USB_VENDOR_ID_EMS, USB_DEVICE_ID_EMS_TRIO_LINKER_PLUS_II) },
>> diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
>> index 7484e1b..c2e9369 100644
>> --- a/drivers/hid/hid-ids.h
>> +++ b/drivers/hid/hid-ids.h
>> @@ -225,6 +225,7 @@
>> #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH2 0x72a1
>> #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH3 0x480e
>> #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH4 0x726b
>> +#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH5 0x7302
>>
>> #define USB_VENDOR_ID_ELECOM 0x056e
>> #define USB_DEVICE_ID_ELECOM_BM084 0x0061
>> diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
>> index 58d0e7a..35c53db 100644
>> --- a/drivers/hid/hid-multitouch.c
>> +++ b/drivers/hid/hid-multitouch.c
>> @@ -96,6 +96,7 @@ struct mt_class {
>> #define MT_CLS_3M 0x0101
>> #define MT_CLS_CYPRESS 0x0102
>> #define MT_CLS_EGALAX 0x0103
>> +#define MT_CLS_EGALAX_5FINGER 0x0104
>>
>> #define MT_DEFAULT_MAXCONTACT 10
>>
>> @@ -173,6 +174,14 @@ struct mt_class mt_classes[] = {
>> .sn_move = 4096,
>> .sn_pressure = 32,
>> },
>> + { .name = MT_CLS_EGALAX_5FINGER,
>> + .quirks = MT_QUIRK_SLOT_IS_CONTACTID |
>> + MT_QUIRK_VALID_IS_INRANGE |
>> + MT_QUIRK_EGALAX_XYZ_FIXUP,
>> + .maxcontacts = 5,
>> + .sn_move = 4096,
>> + .sn_pressure = 32,
>> + },
>>
>> { }
>> };
>> @@ -646,6 +655,9 @@ static const struct hid_device_id mt_devices[] = {
>> { .driver_data = MT_CLS_EGALAX,
>> HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
>> USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH4) },
>> + { .driver_data = MT_CLS_EGALAX_5FINGER,
>> + HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
>> + USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH5) },
>>
>> /* Elo TouchSystems IntelliTouch Plus panel */
>> { .driver_data = MT_CLS_DUAL_NSMU_CONTACTID,
>> --
>> 1.7.5.4
>>
>
> --
> Dmitry
> --
> 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
>
--
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] 14+ messages in thread
* Re: [PATCH] Input: HID-multitouch: Add egalax ID for Acer Iconia W500
2011-09-16 9:23 ` Benjamin Tissoires
@ 2011-09-16 9:48 ` Henrik Rydberg
2011-09-16 13:07 ` Marek Vasut
0 siblings, 1 reply; 14+ messages in thread
From: Henrik Rydberg @ 2011-09-16 9:48 UTC (permalink / raw)
To: Benjamin Tissoires
Cc: Dmitry Torokhov, Marek Vasut, linux-input, Jiri Kosina,
Stéphane Chatty
> Globally, the patch is clean. I don't really like it because a cleaner
> way would be to just remove the field .maxcontacts in MT_CLS_EGALAX.
> This would require tests from all the different eGalax owners, and
> personally, I don't have the time to lead them.
It is not too late to start now, though; testing this new device
without maxcontacts would help when/if the ten-finger version comes
along. Marek, would you care to try that?
Thanks,
Henrik
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH] Input: HID-multitouch: Add egalax ID for Acer Iconia W500
2011-09-16 9:48 ` Henrik Rydberg
@ 2011-09-16 13:07 ` Marek Vasut
2011-09-16 14:47 ` Henrik Rydberg
0 siblings, 1 reply; 14+ messages in thread
From: Marek Vasut @ 2011-09-16 13:07 UTC (permalink / raw)
To: Henrik Rydberg
Cc: Benjamin Tissoires, Dmitry Torokhov, linux-input, Jiri Kosina,
Stéphane Chatty
On Friday, September 16, 2011 11:48:56 AM Henrik Rydberg wrote:
> > Globally, the patch is clean. I don't really like it because a cleaner
> > way would be to just remove the field .maxcontacts in MT_CLS_EGALAX.
> > This would require tests from all the different eGalax owners, and
> > personally, I don't have the time to lead them.
>
> It is not too late to start now, though; testing this new device
> without maxcontacts would help when/if the ten-finger version comes
> along. Marek, would you care to try that?
Well I own only this one particular device, not the other ones.
btw sorry about the CC.
Cheers
>
> Thanks,
> Henrik
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH] Input: HID-multitouch: Add egalax ID for Acer Iconia W500
2011-09-16 13:07 ` Marek Vasut
@ 2011-09-16 14:47 ` Henrik Rydberg
2011-09-16 15:23 ` Marek Vasut
0 siblings, 1 reply; 14+ messages in thread
From: Henrik Rydberg @ 2011-09-16 14:47 UTC (permalink / raw)
To: Marek Vasut
Cc: Benjamin Tissoires, Dmitry Torokhov, linux-input, Jiri Kosina,
Stéphane Chatty
On Fri, Sep 16, 2011 at 03:07:44PM +0200, Marek Vasut wrote:
> On Friday, September 16, 2011 11:48:56 AM Henrik Rydberg wrote:
> > > Globally, the patch is clean. I don't really like it because a cleaner
> > > way would be to just remove the field .maxcontacts in MT_CLS_EGALAX.
> > > This would require tests from all the different eGalax owners, and
> > > personally, I don't have the time to lead them.
> >
> > It is not too late to start now, though; testing this new device
> > without maxcontacts would help when/if the ten-finger version comes
> > along. Marek, would you care to try that?
>
> Well I own only this one particular device, not the other ones.
I meant removing .maxcontacts from _your_ patch, and testing on your particular device.
Thanks,
Henrik
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH] Input: HID-multitouch: Add egalax ID for Acer Iconia W500
2011-09-16 14:47 ` Henrik Rydberg
@ 2011-09-16 15:23 ` Marek Vasut
2011-09-20 13:06 ` Jiri Kosina
0 siblings, 1 reply; 14+ messages in thread
From: Marek Vasut @ 2011-09-16 15:23 UTC (permalink / raw)
To: Henrik Rydberg
Cc: Benjamin Tissoires, Dmitry Torokhov, linux-input, Jiri Kosina,
Stéphane Chatty
On Friday, September 16, 2011 04:47:00 PM Henrik Rydberg wrote:
> On Fri, Sep 16, 2011 at 03:07:44PM +0200, Marek Vasut wrote:
> > On Friday, September 16, 2011 11:48:56 AM Henrik Rydberg wrote:
> > > > Globally, the patch is clean. I don't really like it because a
> > > > cleaner way would be to just remove the field .maxcontacts in
> > > > MT_CLS_EGALAX. This would require tests from all the different
> > > > eGalax owners, and personally, I don't have the time to lead them.
> > >
> > > It is not too late to start now, though; testing this new device
> > > without maxcontacts would help when/if the ten-finger version comes
> > > along. Marek, would you care to try that?
> >
> > Well I own only this one particular device, not the other ones.
>
> I meant removing .maxcontacts from _your_ patch, and testing on your
> particular device.
Ah all right, yes, I can try it. But only _after_ my exam on wednesday (or
before in case I start being tired of learning).
You're welcome!
Cheers
>
> Thanks,
> Henrik
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH] Input: HID-multitouch: Add egalax ID for Acer Iconia W500
2011-09-16 15:23 ` Marek Vasut
@ 2011-09-20 13:06 ` Jiri Kosina
0 siblings, 0 replies; 14+ messages in thread
From: Jiri Kosina @ 2011-09-20 13:06 UTC (permalink / raw)
To: Marek Vasut
Cc: Henrik Rydberg, Benjamin Tissoires, Dmitry Torokhov, linux-input,
Stéphane Chatty
On Fri, 16 Sep 2011, Marek Vasut wrote:
> > > > > Globally, the patch is clean. I don't really like it because a
> > > > > cleaner way would be to just remove the field .maxcontacts in
> > > > > MT_CLS_EGALAX. This would require tests from all the different
> > > > > eGalax owners, and personally, I don't have the time to lead them.
> > > >
> > > > It is not too late to start now, though; testing this new device
> > > > without maxcontacts would help when/if the ten-finger version comes
> > > > along. Marek, would you care to try that?
> > >
> > > Well I own only this one particular device, not the other ones.
> >
> > I meant removing .maxcontacts from _your_ patch, and testing on your
> > particular device.
>
> Ah all right, yes, I can try it. But only _after_ my exam on wednesday (or
> before in case I start being tired of learning).
>
> You're welcome!
So I will wait before merging this patch to see the results of Marek's
testing.
--
Jiri Kosina
SUSE Labs
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH] Input: HID-multitouch: Add egalax ID for Acer Iconia W500
@ 2011-11-14 16:41 Marek Vasut
2011-11-14 19:08 ` Chase Douglas
2011-11-15 21:23 ` Chris Bagwell
0 siblings, 2 replies; 14+ messages in thread
From: Marek Vasut @ 2011-11-14 16:41 UTC (permalink / raw)
To: linux-input; +Cc: Marek Vasut, Benjamin Tissoires, chris
This patch adds USB ID for the touchpanel in Acer Iconia W500. The panel
supports up to five fingers, therefore the need for a new addition of panel
types.
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Benjamin Tissoires <benjamin.tissoires@gmail.com>
Cc: chris@cnpbagwell.com
---
drivers/hid/hid-core.c | 1 +
drivers/hid/hid-ids.h | 1 +
drivers/hid/hid-multitouch.c | 12 ++++++++++++
3 files changed, 14 insertions(+), 0 deletions(-)
NOTE: That checkpatch warning is there because I followed the pattern in
hid-core.c
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index 242353d..6600ac7 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1377,6 +1377,7 @@ static const struct hid_device_id hid_have_special_driver[] = {
{ HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH2) },
{ HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH3) },
{ HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH4) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH5) },
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_BM084) },
{ HID_USB_DEVICE(USB_VENDOR_ID_ELO, USB_DEVICE_ID_ELO_TS2515) },
{ HID_USB_DEVICE(USB_VENDOR_ID_EMS, USB_DEVICE_ID_EMS_TRIO_LINKER_PLUS_II) },
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 7484e1b..c2e9369 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -225,6 +225,7 @@
#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH2 0x72a1
#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH3 0x480e
#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH4 0x726b
+#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH5 0x7302
#define USB_VENDOR_ID_ELECOM 0x056e
#define USB_DEVICE_ID_ELECOM_BM084 0x0061
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index 58d0e7a..35c53db 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -96,6 +96,7 @@ struct mt_class {
#define MT_CLS_3M 0x0101
#define MT_CLS_CYPRESS 0x0102
#define MT_CLS_EGALAX 0x0103
+#define MT_CLS_EGALAX_5FINGER 0x0104
#define MT_DEFAULT_MAXCONTACT 10
@@ -173,6 +174,13 @@ struct mt_class mt_classes[] = {
.sn_move = 4096,
.sn_pressure = 32,
},
+ { .name = MT_CLS_EGALAX_5FINGER,
+ .quirks = MT_QUIRK_SLOT_IS_CONTACTID |
+ MT_QUIRK_VALID_IS_INRANGE |
+ MT_QUIRK_EGALAX_XYZ_FIXUP,
+ .sn_move = 4096,
+ .sn_pressure = 32,
+ },
{ }
};
@@ -646,6 +655,9 @@ static const struct hid_device_id mt_devices[] = {
{ .driver_data = MT_CLS_EGALAX,
HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH4) },
+ { .driver_data = MT_CLS_EGALAX_5FINGER,
+ HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
+ USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH5) },
/* Elo TouchSystems IntelliTouch Plus panel */
{ .driver_data = MT_CLS_DUAL_NSMU_CONTACTID,
--
1.7.5.4
^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [PATCH] Input: HID-multitouch: Add egalax ID for Acer Iconia W500
2011-11-14 16:41 [PATCH] Input: HID-multitouch: Add egalax ID for Acer Iconia W500 Marek Vasut
@ 2011-11-14 19:08 ` Chase Douglas
2011-11-15 21:23 ` Chris Bagwell
1 sibling, 0 replies; 14+ messages in thread
From: Chase Douglas @ 2011-11-14 19:08 UTC (permalink / raw)
To: Marek Vasut; +Cc: linux-input, Benjamin Tissoires, chris
On 11/14/2011 08:41 AM, Marek Vasut wrote:
> This patch adds USB ID for the touchpanel in Acer Iconia W500. The panel
> supports up to five fingers, therefore the need for a new addition of panel
> types.
>
> Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
> Cc: Benjamin Tissoires <benjamin.tissoires@gmail.com>
> Cc: chris@cnpbagwell.com
For patches that are simply device ID additions, please remember to add:
Cc: stable@vger.kernel.org
This really helps all distributors quickly pick up the additions.
Thanks!
-- Chase
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH] Input: HID-multitouch: Add egalax ID for Acer Iconia W500
2011-11-14 16:41 [PATCH] Input: HID-multitouch: Add egalax ID for Acer Iconia W500 Marek Vasut
2011-11-14 19:08 ` Chase Douglas
@ 2011-11-15 21:23 ` Chris Bagwell
2011-11-15 21:28 ` Marek Vasut
1 sibling, 1 reply; 14+ messages in thread
From: Chris Bagwell @ 2011-11-15 21:23 UTC (permalink / raw)
To: Marek Vasut; +Cc: linux-input, Benjamin Tissoires
On Mon, Nov 14, 2011 at 10:41 AM, Marek Vasut <marek.vasut@gmail.com> wrote:
> This patch adds USB ID for the touchpanel in Acer Iconia W500. The panel
> supports up to five fingers, therefore the need for a new addition of panel
> types.
>
> Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
> Cc: Benjamin Tissoires <benjamin.tissoires@gmail.com>
> Cc: chris@cnpbagwell.com
> ---
> drivers/hid/hid-core.c | 1 +
> drivers/hid/hid-ids.h | 1 +
> drivers/hid/hid-multitouch.c | 12 ++++++++++++
> 3 files changed, 14 insertions(+), 0 deletions(-)
>
> NOTE: That checkpatch warning is there because I followed the pattern in
> hid-core.c
>
> diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
> index 242353d..6600ac7 100644
> --- a/drivers/hid/hid-core.c
> +++ b/drivers/hid/hid-core.c
> @@ -1377,6 +1377,7 @@ static const struct hid_device_id hid_have_special_driver[] = {
> { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH2) },
> { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH3) },
> { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH4) },
> + { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH5) },
We have a merge issue here since the 0xa001 got committed as #5.
> { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_BM084) },
> { HID_USB_DEVICE(USB_VENDOR_ID_ELO, USB_DEVICE_ID_ELO_TS2515) },
> { HID_USB_DEVICE(USB_VENDOR_ID_EMS, USB_DEVICE_ID_EMS_TRIO_LINKER_PLUS_II) },
> diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
> index 7484e1b..c2e9369 100644
> --- a/drivers/hid/hid-ids.h
> +++ b/drivers/hid/hid-ids.h
> @@ -225,6 +225,7 @@
> #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH2 0x72a1
> #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH3 0x480e
> #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH4 0x726b
> +#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH5 0x7302
>
> #define USB_VENDOR_ID_ELECOM 0x056e
> #define USB_DEVICE_ID_ELECOM_BM084 0x0061
> diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
> index 58d0e7a..35c53db 100644
> --- a/drivers/hid/hid-multitouch.c
> +++ b/drivers/hid/hid-multitouch.c
> @@ -96,6 +96,7 @@ struct mt_class {
> #define MT_CLS_3M 0x0101
> #define MT_CLS_CYPRESS 0x0102
> #define MT_CLS_EGALAX 0x0103
> +#define MT_CLS_EGALAX_5FINGER 0x0104
>
> #define MT_DEFAULT_MAXCONTACT 10
>
> @@ -173,6 +174,13 @@ struct mt_class mt_classes[] = {
> .sn_move = 4096,
> .sn_pressure = 32,
> },
> + { .name = MT_CLS_EGALAX_5FINGER,
> + .quirks = MT_QUIRK_SLOT_IS_CONTACTID |
> + MT_QUIRK_VALID_IS_INRANGE |
> + MT_QUIRK_EGALAX_XYZ_FIXUP,
> + .sn_move = 4096,
> + .sn_pressure = 32,
> + },
I went and looked up the original thread to see background on this change.
The original thread in September requested to remove .maxcontacts from
MT_CLS_EGALAX. I'd either do that if it works or I would rename this
to something like MT_CLS_EGALAX_HAS_MAXCONTACTS because the 5FINGER
part is misleading.
Chris
>
> { }
> };
> @@ -646,6 +655,9 @@ static const struct hid_device_id mt_devices[] = {
> { .driver_data = MT_CLS_EGALAX,
> HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
> USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH4) },
> + { .driver_data = MT_CLS_EGALAX_5FINGER,
> + HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
> + USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH5) },
>
> /* Elo TouchSystems IntelliTouch Plus panel */
> { .driver_data = MT_CLS_DUAL_NSMU_CONTACTID,
> --
> 1.7.5.4
>
>
--
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] 14+ messages in thread
* Re: [PATCH] Input: HID-multitouch: Add egalax ID for Acer Iconia W500
2011-11-15 21:23 ` Chris Bagwell
@ 2011-11-15 21:28 ` Marek Vasut
2011-11-15 21:44 ` Chris Bagwell
0 siblings, 1 reply; 14+ messages in thread
From: Marek Vasut @ 2011-11-15 21:28 UTC (permalink / raw)
To: Chris Bagwell; +Cc: linux-input, Benjamin Tissoires
> On Mon, Nov 14, 2011 at 10:41 AM, Marek Vasut <marek.vasut@gmail.com> wrote:
> > This patch adds USB ID for the touchpanel in Acer Iconia W500. The panel
> > supports up to five fingers, therefore the need for a new addition of
> > panel types.
> >
> > Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
> > Cc: Benjamin Tissoires <benjamin.tissoires@gmail.com>
> > Cc: chris@cnpbagwell.com
> > ---
> > drivers/hid/hid-core.c | 1 +
> > drivers/hid/hid-ids.h | 1 +
> > drivers/hid/hid-multitouch.c | 12 ++++++++++++
> > 3 files changed, 14 insertions(+), 0 deletions(-)
> >
> > NOTE: That checkpatch warning is there because I followed the pattern in
> > hid-core.c
> >
> > diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
> > index 242353d..6600ac7 100644
> > --- a/drivers/hid/hid-core.c
> > +++ b/drivers/hid/hid-core.c
> > @@ -1377,6 +1377,7 @@ static const struct hid_device_id
> > hid_have_special_driver[] = { { HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
> > USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH2) }, {
> > HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
> > USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH3) }, {
> > HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
> > USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH4) }, + {
> > HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
> > USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH5) },
>
> We have a merge issue here since the 0xa001 got committed as #5.
Was it applied already?
>
> > { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_ELECOM,
> > USB_DEVICE_ID_ELECOM_BM084) }, { HID_USB_DEVICE(USB_VENDOR_ID_ELO,
> > USB_DEVICE_ID_ELO_TS2515) }, { HID_USB_DEVICE(USB_VENDOR_ID_EMS,
> > USB_DEVICE_ID_EMS_TRIO_LINKER_PLUS_II) }, diff --git
> > a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
> > index 7484e1b..c2e9369 100644
> > --- a/drivers/hid/hid-ids.h
> > +++ b/drivers/hid/hid-ids.h
> > @@ -225,6 +225,7 @@
> > #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH2 0x72a1
> > #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH3 0x480e
> > #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH4 0x726b
> > +#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH5 0x7302
> >
> > #define USB_VENDOR_ID_ELECOM 0x056e
> > #define USB_DEVICE_ID_ELECOM_BM084 0x0061
> > diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
> > index 58d0e7a..35c53db 100644
> > --- a/drivers/hid/hid-multitouch.c
> > +++ b/drivers/hid/hid-multitouch.c
> > @@ -96,6 +96,7 @@ struct mt_class {
> > #define MT_CLS_3M 0x0101
> > #define MT_CLS_CYPRESS 0x0102
> > #define MT_CLS_EGALAX 0x0103
> > +#define MT_CLS_EGALAX_5FINGER 0x0104
> >
> > #define MT_DEFAULT_MAXCONTACT 10
> >
> > @@ -173,6 +174,13 @@ struct mt_class mt_classes[] = {
> > .sn_move = 4096,
> > .sn_pressure = 32,
> > },
> > + { .name = MT_CLS_EGALAX_5FINGER,
> > + .quirks = MT_QUIRK_SLOT_IS_CONTACTID |
> > + MT_QUIRK_VALID_IS_INRANGE |
> > + MT_QUIRK_EGALAX_XYZ_FIXUP,
> > + .sn_move = 4096,
> > + .sn_pressure = 32,
> > + },
>
> I went and looked up the original thread to see background on this change.
>
> The original thread in September requested to remove .maxcontacts from
> MT_CLS_EGALAX. I'd either do that if it works or I would rename this
> to something like MT_CLS_EGALAX_HAS_MAXCONTACTS because the 5FINGER
> part is misleading.
Sounds reasonable.
M
>
> Chris
>
> > { }
> > };
> > @@ -646,6 +655,9 @@ static const struct hid_device_id mt_devices[] = {
> > { .driver_data = MT_CLS_EGALAX,
> > HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
> > USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH4) },
> > + { .driver_data = MT_CLS_EGALAX_5FINGER,
> > + HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
> > + USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH5) },
> >
> > /* Elo TouchSystems IntelliTouch Plus panel */
> > { .driver_data = MT_CLS_DUAL_NSMU_CONTACTID,
> > --
> > 1.7.5.4
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH] Input: HID-multitouch: Add egalax ID for Acer Iconia W500
2011-11-15 21:28 ` Marek Vasut
@ 2011-11-15 21:44 ` Chris Bagwell
2011-11-15 22:20 ` Marek Vasut
0 siblings, 1 reply; 14+ messages in thread
From: Chris Bagwell @ 2011-11-15 21:44 UTC (permalink / raw)
To: Marek Vasut; +Cc: linux-input, Benjamin Tissoires
On Tue, Nov 15, 2011 at 3:28 PM, Marek Vasut <marek.vasut@gmail.com> wrote:
>> On Mon, Nov 14, 2011 at 10:41 AM, Marek Vasut <marek.vasut@gmail.com> wrote:
>> > @@ -1377,6 +1377,7 @@ static const struct hid_device_id
>> > hid_have_special_driver[] = { { HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
>> > USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH2) }, {
>> > HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
>> > USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH3) }, {
>> > HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
>> > USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH4) }, + {
>> > HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
>> > USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH5) },
>>
>> We have a merge issue here since the 0xa001 got committed as #5.
>
> Was it applied already?
>
Yes, its in Jiri's upstream-fixes branch.
Chris
--
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] 14+ messages in thread
* Re: [PATCH] Input: HID-multitouch: Add egalax ID for Acer Iconia W500
2011-11-15 21:44 ` Chris Bagwell
@ 2011-11-15 22:20 ` Marek Vasut
0 siblings, 0 replies; 14+ messages in thread
From: Marek Vasut @ 2011-11-15 22:20 UTC (permalink / raw)
To: Chris Bagwell; +Cc: linux-input, Benjamin Tissoires
> On Tue, Nov 15, 2011 at 3:28 PM, Marek Vasut <marek.vasut@gmail.com> wrote:
> >> On Mon, Nov 14, 2011 at 10:41 AM, Marek Vasut <marek.vasut@gmail.com>
wrote:
> >> > @@ -1377,6 +1377,7 @@ static const struct hid_device_id
> >> > hid_have_special_driver[] = { { HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
> >> > USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH2) }, {
> >> > HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
> >> > USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH3) }, {
> >> > HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
> >> > USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH4) }, + {
> >> > HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
> >> > USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH5) },
> >>
> >> We have a merge issue here since the 0xa001 got committed as #5.
> >
> > Was it applied already?
>
> Yes, its in Jiri's upstream-fixes branch.
>
> Chris
Good
M
^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2011-11-15 22:20 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-14 16:41 [PATCH] Input: HID-multitouch: Add egalax ID for Acer Iconia W500 Marek Vasut
2011-11-14 19:08 ` Chase Douglas
2011-11-15 21:23 ` Chris Bagwell
2011-11-15 21:28 ` Marek Vasut
2011-11-15 21:44 ` Chris Bagwell
2011-11-15 22:20 ` Marek Vasut
-- strict thread matches above, loose matches on Subject: below --
2011-09-14 3:15 Marek Vasut
2011-09-16 6:28 ` Dmitry Torokhov
2011-09-16 9:23 ` Benjamin Tissoires
2011-09-16 9:48 ` Henrik Rydberg
2011-09-16 13:07 ` Marek Vasut
2011-09-16 14:47 ` Henrik Rydberg
2011-09-16 15:23 ` Marek Vasut
2011-09-20 13:06 ` Jiri Kosina
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).