mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-08-22 17:01:14 +00:00
Code Issues Releases Wiki Activity

HID: asus: Add touchpad max x/y and resolution info for the T200TA

Browse source 
The Asus T200TA uses the same USB device-id for its keyboard dock as the
T100TA, but the touchpad has a different size and corresponding different
max x/y values.

Add a separate asus_touchpad_info struct for the T200TA and select this
based on the DMI product-name (as we are already doing for the T100HA),
so that we report the correct info to userspace.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
This commit is contained in:
Hans de Goede 2018-01-05 12:09:18 +01:00 committed by Jiri Kosina
parent 762f948c97
commit dbd3ef28e0
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
drivers/hid/hid-asus.c
View file

@ -129,6 +129,15 @@ static const struct asus_touchpad_info asus_t100ha_tp = {
.max_contacts = 5, .max_contacts = 5,
}; };
static const struct asus_touchpad_info asus_t200ta_tp = {
.max_x = 3120,
.max_y = 1716,
.res_x = 30, /* units/mm */
.res_y = 28, /* units/mm */
.contact_size = 5,
.max_contacts = 5,
};
static const struct asus_touchpad_info asus_t100chi_tp = { static const struct asus_touchpad_info asus_t100chi_tp = {
.max_x = 2640, .max_x = 2640,
.max_y = 1320, .max_y = 1320,
@ -617,11 +626,14 @@ static int asus_probe(struct hid_device *hdev, const struct hid_device_id *id)
if (intf->altsetting->desc.bInterfaceNumber == T100_TPAD_INTF) { if (intf->altsetting->desc.bInterfaceNumber == T100_TPAD_INTF) {
drvdata->quirks = QUIRK_SKIP_INPUT_MAPPING; drvdata->quirks = QUIRK_SKIP_INPUT_MAPPING;
/* /*
* The T100HA uses the same USB-ids as the T100TAF, * The T100HA uses the same USB-ids as the T100TAF and
* but has different max_x / max_y values. * the T200TA uses the same USB-ids as the T100TA, while
* both have different max x/y values as the T100TA[F].
*/ */
if (dmi_match(DMI_PRODUCT_NAME, "T100HAN")) if (dmi_match(DMI_PRODUCT_NAME, "T100HAN"))
drvdata->tp = &asus_t100ha_tp; drvdata->tp = &asus_t100ha_tp;
else if (dmi_match(DMI_PRODUCT_NAME, "T200TA"))
drvdata->tp = &asus_t200ta_tp;
else else
drvdata->tp = &asus_t100ta_tp; drvdata->tp = &asus_t100ta_tp;
} }