* [PATCH] HID: asus: Add product-id for the T100TAF keyboard dock
@ 2017-11-22 12:05 Hans de Goede
2017-11-22 14:06 ` Benjamin Tissoires
2017-11-23 14:41 ` Hans de Goede
0 siblings, 2 replies; 4+ messages in thread
From: Hans de Goede @ 2017-11-22 12:05 UTC (permalink / raw)
To: Jiri Kosina, Benjamin Tissoires; +Cc: Hans de Goede, linux-input, stable
The T100TAF keyboard dock has the same special keys and custom
protocol multitouch touchpad as the T100TA, but uses a different
product id, add support for this.
Cc: stable@vger.kernel.org
BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=197849
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
drivers/hid/hid-asus.c | 5 ++++-
drivers/hid/hid-core.c | 3 ++-
drivers/hid/hid-ids.h | 3 ++-
3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/drivers/hid/hid-asus.c b/drivers/hid/hid-asus.c
index 1bb7b63b3150..4cdac9857037 100644
--- a/drivers/hid/hid-asus.c
+++ b/drivers/hid/hid-asus.c
@@ -751,7 +751,10 @@ static const struct hid_device_id asus_devices[] = {
{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,
USB_DEVICE_ID_ASUSTEK_ROG_KEYBOARD3), QUIRK_G752_KEYBOARD },
{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,
- USB_DEVICE_ID_ASUSTEK_T100_KEYBOARD),
+ USB_DEVICE_ID_ASUSTEK_T100TA_KEYBOARD),
+ QUIRK_T100_KEYBOARD | QUIRK_NO_CONSUMER_USAGES },
+ { HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,
+ USB_DEVICE_ID_ASUSTEK_T100TAF_KEYBOARD),
QUIRK_T100_KEYBOARD | QUIRK_NO_CONSUMER_USAGES },
{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_ASUS_AK1D) },
{ HID_USB_DEVICE(USB_VENDOR_ID_TURBOX, USB_DEVICE_ID_ASUS_MD_5110) },
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index f3fcb836a1f9..d6780e1d2526 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1983,7 +1983,8 @@ static const struct hid_device_id hid_have_special_driver[] = {
{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_ROG_KEYBOARD1) },
{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_ROG_KEYBOARD2) },
{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_ROG_KEYBOARD3) },
- { HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_T100_KEYBOARD) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_T100TA_KEYBOARD) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_T100TAF_KEYBOARD) },
{ HID_USB_DEVICE(USB_VENDOR_ID_JESS, USB_DEVICE_ID_ASUS_MD_5112) },
{ HID_USB_DEVICE(USB_VENDOR_ID_TURBOX, USB_DEVICE_ID_ASUS_MD_5110) },
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_T100CHI_KEYBOARD) },
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 5da3d6256d25..dc1db8558850 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -178,7 +178,8 @@
#define USB_VENDOR_ID_ASUSTEK 0x0b05
#define USB_DEVICE_ID_ASUSTEK_LCM 0x1726
#define USB_DEVICE_ID_ASUSTEK_LCM2 0x175b
-#define USB_DEVICE_ID_ASUSTEK_T100_KEYBOARD 0x17e0
+#define USB_DEVICE_ID_ASUSTEK_T100TA_KEYBOARD 0x17e0
+#define USB_DEVICE_ID_ASUSTEK_T100TAF_KEYBOARD 0x1807
#define USB_DEVICE_ID_ASUSTEK_T100CHI_KEYBOARD 0x8502
#define USB_DEVICE_ID_ASUSTEK_T304_KEYBOARD 0x184a
#define USB_DEVICE_ID_ASUSTEK_I2C_KEYBOARD 0x8585
--
2.14.3
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] HID: asus: Add product-id for the T100TAF keyboard dock
2017-11-22 12:05 [PATCH] HID: asus: Add product-id for the T100TAF keyboard dock Hans de Goede
@ 2017-11-22 14:06 ` Benjamin Tissoires
2017-11-23 14:41 ` Hans de Goede
1 sibling, 0 replies; 4+ messages in thread
From: Benjamin Tissoires @ 2017-11-22 14:06 UTC (permalink / raw)
To: Hans de Goede; +Cc: Jiri Kosina, linux-input, stable
On Nov 22 2017 or thereabouts, Hans de Goede wrote:
> The T100TAF keyboard dock has the same special keys and custom
> protocol multitouch touchpad as the T100TA, but uses a different
> product id, add support for this.
>
> Cc: stable@vger.kernel.org
> BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=197849
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
> ---
> drivers/hid/hid-asus.c | 5 ++++-
> drivers/hid/hid-core.c | 3 ++-
> drivers/hid/hid-ids.h | 3 ++-
> 3 files changed, 8 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/hid/hid-asus.c b/drivers/hid/hid-asus.c
> index 1bb7b63b3150..4cdac9857037 100644
> --- a/drivers/hid/hid-asus.c
> +++ b/drivers/hid/hid-asus.c
> @@ -751,7 +751,10 @@ static const struct hid_device_id asus_devices[] = {
> { HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,
> USB_DEVICE_ID_ASUSTEK_ROG_KEYBOARD3), QUIRK_G752_KEYBOARD },
> { HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,
> - USB_DEVICE_ID_ASUSTEK_T100_KEYBOARD),
> + USB_DEVICE_ID_ASUSTEK_T100TA_KEYBOARD),
> + QUIRK_T100_KEYBOARD | QUIRK_NO_CONSUMER_USAGES },
> + { HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,
> + USB_DEVICE_ID_ASUSTEK_T100TAF_KEYBOARD),
> QUIRK_T100_KEYBOARD | QUIRK_NO_CONSUMER_USAGES },
> { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_ASUS_AK1D) },
> { HID_USB_DEVICE(USB_VENDOR_ID_TURBOX, USB_DEVICE_ID_ASUS_MD_5110) },
> diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
> index f3fcb836a1f9..d6780e1d2526 100644
> --- a/drivers/hid/hid-core.c
> +++ b/drivers/hid/hid-core.c
> @@ -1983,7 +1983,8 @@ static const struct hid_device_id hid_have_special_driver[] = {
> { HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_ROG_KEYBOARD1) },
> { HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_ROG_KEYBOARD2) },
> { HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_ROG_KEYBOARD3) },
> - { HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_T100_KEYBOARD) },
> + { HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_T100TA_KEYBOARD) },
> + { HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_T100TAF_KEYBOARD) },
In Jiri's 4.16 branch, this has just moved to drivers/hid-quirks.c and
is not really necessary anymore (and I am thinking we should actually
not add new devices there because it is a nice feature to keep the
hid-generic fallback).
But given that the patch is rather small and matches stable criterias,
I'd say, for the 4.15 branch:
Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Though problem is going to be to merge this with for-next once the 4.16
branch gets merged in.
Cheers,
Benjamin
> { HID_USB_DEVICE(USB_VENDOR_ID_JESS, USB_DEVICE_ID_ASUS_MD_5112) },
> { HID_USB_DEVICE(USB_VENDOR_ID_TURBOX, USB_DEVICE_ID_ASUS_MD_5110) },
> { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_T100CHI_KEYBOARD) },
> diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
> index 5da3d6256d25..dc1db8558850 100644
> --- a/drivers/hid/hid-ids.h
> +++ b/drivers/hid/hid-ids.h
> @@ -178,7 +178,8 @@
> #define USB_VENDOR_ID_ASUSTEK 0x0b05
> #define USB_DEVICE_ID_ASUSTEK_LCM 0x1726
> #define USB_DEVICE_ID_ASUSTEK_LCM2 0x175b
> -#define USB_DEVICE_ID_ASUSTEK_T100_KEYBOARD 0x17e0
> +#define USB_DEVICE_ID_ASUSTEK_T100TA_KEYBOARD 0x17e0
> +#define USB_DEVICE_ID_ASUSTEK_T100TAF_KEYBOARD 0x1807
> #define USB_DEVICE_ID_ASUSTEK_T100CHI_KEYBOARD 0x8502
> #define USB_DEVICE_ID_ASUSTEK_T304_KEYBOARD 0x184a
> #define USB_DEVICE_ID_ASUSTEK_I2C_KEYBOARD 0x8585
> --
> 2.14.3
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] HID: asus: Add product-id for the T100TAF keyboard dock
2017-11-22 12:05 [PATCH] HID: asus: Add product-id for the T100TAF keyboard dock Hans de Goede
2017-11-22 14:06 ` Benjamin Tissoires
@ 2017-11-23 14:41 ` Hans de Goede
2017-11-23 16:31 ` Hans de Goede
1 sibling, 1 reply; 4+ messages in thread
From: Hans de Goede @ 2017-11-23 14:41 UTC (permalink / raw)
To: Jiri Kosina, Benjamin Tissoires; +Cc: linux-input, stable
Hi,
On 22-11-17 13:05, Hans de Goede wrote:
> The T100TAF keyboard dock has the same special keys and custom
> protocol multitouch touchpad as the T100TA, but uses a different
> product id, add support for this.
>
> Cc: stable@vger.kernel.org
> BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=197849
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Self nack, this patch is no good, the touchpad has a different
resolution then the one in the T100TA (I forgot to check this)
so a slightly more comprehensive patch is needed.
Regards,
Hans
> ---
> drivers/hid/hid-asus.c | 5 ++++-
> drivers/hid/hid-core.c | 3 ++-
> drivers/hid/hid-ids.h | 3 ++-
> 3 files changed, 8 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/hid/hid-asus.c b/drivers/hid/hid-asus.c
> index 1bb7b63b3150..4cdac9857037 100644
> --- a/drivers/hid/hid-asus.c
> +++ b/drivers/hid/hid-asus.c
> @@ -751,7 +751,10 @@ static const struct hid_device_id asus_devices[] = {
> { HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,
> USB_DEVICE_ID_ASUSTEK_ROG_KEYBOARD3), QUIRK_G752_KEYBOARD },
> { HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,
> - USB_DEVICE_ID_ASUSTEK_T100_KEYBOARD),
> + USB_DEVICE_ID_ASUSTEK_T100TA_KEYBOARD),
> + QUIRK_T100_KEYBOARD | QUIRK_NO_CONSUMER_USAGES },
> + { HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,
> + USB_DEVICE_ID_ASUSTEK_T100TAF_KEYBOARD),
> QUIRK_T100_KEYBOARD | QUIRK_NO_CONSUMER_USAGES },
> { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_ASUS_AK1D) },
> { HID_USB_DEVICE(USB_VENDOR_ID_TURBOX, USB_DEVICE_ID_ASUS_MD_5110) },
> diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
> index f3fcb836a1f9..d6780e1d2526 100644
> --- a/drivers/hid/hid-core.c
> +++ b/drivers/hid/hid-core.c
> @@ -1983,7 +1983,8 @@ static const struct hid_device_id hid_have_special_driver[] = {
> { HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_ROG_KEYBOARD1) },
> { HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_ROG_KEYBOARD2) },
> { HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_ROG_KEYBOARD3) },
> - { HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_T100_KEYBOARD) },
> + { HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_T100TA_KEYBOARD) },
> + { HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_T100TAF_KEYBOARD) },
> { HID_USB_DEVICE(USB_VENDOR_ID_JESS, USB_DEVICE_ID_ASUS_MD_5112) },
> { HID_USB_DEVICE(USB_VENDOR_ID_TURBOX, USB_DEVICE_ID_ASUS_MD_5110) },
> { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_T100CHI_KEYBOARD) },
> diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
> index 5da3d6256d25..dc1db8558850 100644
> --- a/drivers/hid/hid-ids.h
> +++ b/drivers/hid/hid-ids.h
> @@ -178,7 +178,8 @@
> #define USB_VENDOR_ID_ASUSTEK 0x0b05
> #define USB_DEVICE_ID_ASUSTEK_LCM 0x1726
> #define USB_DEVICE_ID_ASUSTEK_LCM2 0x175b
> -#define USB_DEVICE_ID_ASUSTEK_T100_KEYBOARD 0x17e0
> +#define USB_DEVICE_ID_ASUSTEK_T100TA_KEYBOARD 0x17e0
> +#define USB_DEVICE_ID_ASUSTEK_T100TAF_KEYBOARD 0x1807
> #define USB_DEVICE_ID_ASUSTEK_T100CHI_KEYBOARD 0x8502
> #define USB_DEVICE_ID_ASUSTEK_T304_KEYBOARD 0x184a
> #define USB_DEVICE_ID_ASUSTEK_I2C_KEYBOARD 0x8585
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] HID: asus: Add product-id for the T100TAF keyboard dock
2017-11-23 14:41 ` Hans de Goede
@ 2017-11-23 16:31 ` Hans de Goede
0 siblings, 0 replies; 4+ messages in thread
From: Hans de Goede @ 2017-11-23 16:31 UTC (permalink / raw)
To: Jiri Kosina, Benjamin Tissoires; +Cc: linux-input, stable
Hi,
On 23-11-17 15:41, Hans de Goede wrote:
> Hi,
>
> On 22-11-17 13:05, Hans de Goede wrote:
>> The T100TAF keyboard dock has the same special keys and custom
>> protocol multitouch touchpad as the T100TA, but uses a different
>> product id, add support for this.
>>
>> Cc: stable@vger.kernel.org
>> BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=197849
>> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
>
> Self nack, this patch is no good, the touchpad has a different
> resolution then the one in the T100TA (I forgot to check this)
> so a slightly more comprehensive patch is needed.
Quick follow-up, so as the $subject and:
https://bugzilla.kernel.org/show_bug.cgi?id=197849
Indicate, the new device-id this patch was adding is for the
T100TAF, but I've a T100HA myself and that is using the same
device-id. I've seen the different resolution / coordinate-range
on the T100HA, looking at pictures the T100TAF dock looks
identical to the T100TA dock, where as the T100HA dock is
different and has a different size touchpad.
So I'm wondering if the T100TAF, despite reportedly having
a new usb-id, should use the T100TA coordinate ranges
where as the T100HA is using T100CHI ranges (but T100TA
protocol).
TL;DR: This is going to need some more work and input
from the reporter. The good news is though that this
means it is not really 4.15 material, so I can rebase
on top of for-4.16/hid-quirks-cleanup/_base and Jiri
can do a straight forward merge of it once it is ready.
Regards,
Hans
>> ---
>> drivers/hid/hid-asus.c | 5 ++++-
>> drivers/hid/hid-core.c | 3 ++-
>> drivers/hid/hid-ids.h | 3 ++-
>> 3 files changed, 8 insertions(+), 3 deletions(-)
>>
>> diff --git a/drivers/hid/hid-asus.c b/drivers/hid/hid-asus.c
>> index 1bb7b63b3150..4cdac9857037 100644
>> --- a/drivers/hid/hid-asus.c
>> +++ b/drivers/hid/hid-asus.c
>> @@ -751,7 +751,10 @@ static const struct hid_device_id asus_devices[] = {
>> { HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,
>> USB_DEVICE_ID_ASUSTEK_ROG_KEYBOARD3), QUIRK_G752_KEYBOARD },
>> { HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,
>> - USB_DEVICE_ID_ASUSTEK_T100_KEYBOARD),
>> + USB_DEVICE_ID_ASUSTEK_T100TA_KEYBOARD),
>> + QUIRK_T100_KEYBOARD | QUIRK_NO_CONSUMER_USAGES },
>> + { HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,
>> + USB_DEVICE_ID_ASUSTEK_T100TAF_KEYBOARD),
>> QUIRK_T100_KEYBOARD | QUIRK_NO_CONSUMER_USAGES },
>> { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_ASUS_AK1D) },
>> { HID_USB_DEVICE(USB_VENDOR_ID_TURBOX, USB_DEVICE_ID_ASUS_MD_5110) },
>> diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
>> index f3fcb836a1f9..d6780e1d2526 100644
>> --- a/drivers/hid/hid-core.c
>> +++ b/drivers/hid/hid-core.c
>> @@ -1983,7 +1983,8 @@ static const struct hid_device_id hid_have_special_driver[] = {
>> { HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_ROG_KEYBOARD1) },
>> { HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_ROG_KEYBOARD2) },
>> { HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_ROG_KEYBOARD3) },
>> - { HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_T100_KEYBOARD) },
>> + { HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_T100TA_KEYBOARD) },
>> + { HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_T100TAF_KEYBOARD) },
>> { HID_USB_DEVICE(USB_VENDOR_ID_JESS, USB_DEVICE_ID_ASUS_MD_5112) },
>> { HID_USB_DEVICE(USB_VENDOR_ID_TURBOX, USB_DEVICE_ID_ASUS_MD_5110) },
>> { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_T100CHI_KEYBOARD) },
>> diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
>> index 5da3d6256d25..dc1db8558850 100644
>> --- a/drivers/hid/hid-ids.h
>> +++ b/drivers/hid/hid-ids.h
>> @@ -178,7 +178,8 @@
>> #define USB_VENDOR_ID_ASUSTEK 0x0b05
>> #define USB_DEVICE_ID_ASUSTEK_LCM 0x1726
>> #define USB_DEVICE_ID_ASUSTEK_LCM2 0x175b
>> -#define USB_DEVICE_ID_ASUSTEK_T100_KEYBOARD 0x17e0
>> +#define USB_DEVICE_ID_ASUSTEK_T100TA_KEYBOARD 0x17e0
>> +#define USB_DEVICE_ID_ASUSTEK_T100TAF_KEYBOARD 0x1807
>> #define USB_DEVICE_ID_ASUSTEK_T100CHI_KEYBOARD 0x8502
>> #define USB_DEVICE_ID_ASUSTEK_T304_KEYBOARD 0x184a
>> #define USB_DEVICE_ID_ASUSTEK_I2C_KEYBOARD 0x8585
>>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-11-23 16:31 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-11-22 12:05 [PATCH] HID: asus: Add product-id for the T100TAF keyboard dock Hans de Goede
2017-11-22 14:06 ` Benjamin Tissoires
2017-11-23 14:41 ` Hans de Goede
2017-11-23 16:31 ` Hans de Goede
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.