mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 01:10:04 +00:00
HID: asus: Add support for T100 touchpad
Add support for the Asus T100 touchpad in multi-touch mode (rather then mouse emulation mode). It turns out that the Asus T100 touchpad is identical to the already supported i2c-hid Asus touchpads, so adding support for it was easy. The only significant difference is that the reported x-coordinates range on the T100 touchpad is somewhat lower then the range on the already supported touchpads. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
This commit is contained in:
parent
a91ab911df
commit
57573c541b
1 changed files with 18 additions and 3 deletions
|
@ -29,6 +29,7 @@
|
||||||
#include <linux/hid.h>
|
#include <linux/hid.h>
|
||||||
#include <linux/module.h>
|
#include <linux/module.h>
|
||||||
#include <linux/input/mt.h>
|
#include <linux/input/mt.h>
|
||||||
|
#include <linux/usb.h> /* For to_usb_interface for T100 touchpad intf check */
|
||||||
|
|
||||||
#include "hid-ids.h"
|
#include "hid-ids.h"
|
||||||
|
|
||||||
|
@ -38,6 +39,8 @@ MODULE_AUTHOR("Victor Vlasenko <victor.vlasenko@sysgears.com>");
|
||||||
MODULE_AUTHOR("Frederik Wenigwieser <frederik.wenigwieser@gmail.com>");
|
MODULE_AUTHOR("Frederik Wenigwieser <frederik.wenigwieser@gmail.com>");
|
||||||
MODULE_DESCRIPTION("Asus HID Keyboard and TouchPad");
|
MODULE_DESCRIPTION("Asus HID Keyboard and TouchPad");
|
||||||
|
|
||||||
|
#define T100_TPAD_INTF 2
|
||||||
|
|
||||||
#define FEATURE_REPORT_ID 0x0d
|
#define FEATURE_REPORT_ID 0x0d
|
||||||
#define INPUT_REPORT_ID 0x5d
|
#define INPUT_REPORT_ID 0x5d
|
||||||
#define FEATURE_KBD_REPORT_ID 0x5a
|
#define FEATURE_KBD_REPORT_ID 0x5a
|
||||||
|
@ -50,6 +53,7 @@ MODULE_DESCRIPTION("Asus HID Keyboard and TouchPad");
|
||||||
#define MAX_CONTACTS 5
|
#define MAX_CONTACTS 5
|
||||||
|
|
||||||
#define MAX_X 2794
|
#define MAX_X 2794
|
||||||
|
#define MAX_X_T100 2240
|
||||||
#define MAX_Y 1758
|
#define MAX_Y 1758
|
||||||
#define MAX_TOUCH_MAJOR 8
|
#define MAX_TOUCH_MAJOR 8
|
||||||
#define MAX_PRESSURE 128
|
#define MAX_PRESSURE 128
|
||||||
|
@ -70,11 +74,12 @@ MODULE_DESCRIPTION("Asus HID Keyboard and TouchPad");
|
||||||
#define QUIRK_NO_CONSUMER_USAGES BIT(4)
|
#define QUIRK_NO_CONSUMER_USAGES BIT(4)
|
||||||
#define QUIRK_USE_KBD_BACKLIGHT BIT(5)
|
#define QUIRK_USE_KBD_BACKLIGHT BIT(5)
|
||||||
#define QUIRK_T100_KEYBOARD BIT(6)
|
#define QUIRK_T100_KEYBOARD BIT(6)
|
||||||
|
#define QUIRK_T100_TOUCHPAD BIT(7)
|
||||||
|
|
||||||
#define I2C_KEYBOARD_QUIRKS (QUIRK_FIX_NOTEBOOK_REPORT | \
|
#define I2C_KEYBOARD_QUIRKS (QUIRK_FIX_NOTEBOOK_REPORT | \
|
||||||
QUIRK_NO_INIT_REPORTS | \
|
QUIRK_NO_INIT_REPORTS | \
|
||||||
QUIRK_NO_CONSUMER_USAGES)
|
QUIRK_NO_CONSUMER_USAGES)
|
||||||
#define I2C_TOUCHPAD_QUIRKS (QUIRK_NO_INIT_REPORTS | \
|
#define TOUCHPAD_QUIRKS (QUIRK_NO_INIT_REPORTS | \
|
||||||
QUIRK_SKIP_INPUT_MAPPING | \
|
QUIRK_SKIP_INPUT_MAPPING | \
|
||||||
QUIRK_IS_MULTITOUCH)
|
QUIRK_IS_MULTITOUCH)
|
||||||
|
|
||||||
|
@ -337,7 +342,10 @@ static int asus_input_configured(struct hid_device *hdev, struct hid_input *hi)
|
||||||
if (drvdata->quirks & QUIRK_IS_MULTITOUCH) {
|
if (drvdata->quirks & QUIRK_IS_MULTITOUCH) {
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
input_set_abs_params(input, ABS_MT_POSITION_X, 0, MAX_X, 0, 0);
|
if (drvdata->quirks & QUIRK_T100_TOUCHPAD)
|
||||||
|
input_set_abs_params(input, ABS_MT_POSITION_X, 0, MAX_X_T100, 0, 0);
|
||||||
|
else
|
||||||
|
input_set_abs_params(input, ABS_MT_POSITION_X, 0, MAX_X, 0, 0);
|
||||||
input_set_abs_params(input, ABS_MT_POSITION_Y, 0, MAX_Y, 0, 0);
|
input_set_abs_params(input, ABS_MT_POSITION_Y, 0, MAX_Y, 0, 0);
|
||||||
input_set_abs_params(input, ABS_TOOL_WIDTH, 0, MAX_TOUCH_MAJOR, 0, 0);
|
input_set_abs_params(input, ABS_TOOL_WIDTH, 0, MAX_TOUCH_MAJOR, 0, 0);
|
||||||
input_set_abs_params(input, ABS_MT_TOUCH_MAJOR, 0, MAX_TOUCH_MAJOR, 0, 0);
|
input_set_abs_params(input, ABS_MT_TOUCH_MAJOR, 0, MAX_TOUCH_MAJOR, 0, 0);
|
||||||
|
@ -517,6 +525,13 @@ static int asus_probe(struct hid_device *hdev, const struct hid_device_id *id)
|
||||||
|
|
||||||
drvdata->quirks = id->driver_data;
|
drvdata->quirks = id->driver_data;
|
||||||
|
|
||||||
|
if (drvdata->quirks & QUIRK_T100_KEYBOARD) {
|
||||||
|
struct usb_interface *intf = to_usb_interface(hdev->dev.parent);
|
||||||
|
|
||||||
|
if (intf->altsetting->desc.bInterfaceNumber == T100_TPAD_INTF)
|
||||||
|
drvdata->quirks = TOUCHPAD_QUIRKS | QUIRK_T100_TOUCHPAD;
|
||||||
|
}
|
||||||
|
|
||||||
if (drvdata->quirks & QUIRK_NO_INIT_REPORTS)
|
if (drvdata->quirks & QUIRK_NO_INIT_REPORTS)
|
||||||
hdev->quirks |= HID_QUIRK_NO_INIT_REPORTS;
|
hdev->quirks |= HID_QUIRK_NO_INIT_REPORTS;
|
||||||
|
|
||||||
|
@ -591,7 +606,7 @@ static const struct hid_device_id asus_devices[] = {
|
||||||
{ HID_I2C_DEVICE(USB_VENDOR_ID_ASUSTEK,
|
{ HID_I2C_DEVICE(USB_VENDOR_ID_ASUSTEK,
|
||||||
USB_DEVICE_ID_ASUSTEK_I2C_KEYBOARD), I2C_KEYBOARD_QUIRKS},
|
USB_DEVICE_ID_ASUSTEK_I2C_KEYBOARD), I2C_KEYBOARD_QUIRKS},
|
||||||
{ HID_I2C_DEVICE(USB_VENDOR_ID_ASUSTEK,
|
{ HID_I2C_DEVICE(USB_VENDOR_ID_ASUSTEK,
|
||||||
USB_DEVICE_ID_ASUSTEK_I2C_TOUCHPAD), I2C_TOUCHPAD_QUIRKS },
|
USB_DEVICE_ID_ASUSTEK_I2C_TOUCHPAD), TOUCHPAD_QUIRKS },
|
||||||
{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,
|
{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,
|
||||||
USB_DEVICE_ID_ASUSTEK_ROG_KEYBOARD1) },
|
USB_DEVICE_ID_ASUSTEK_ROG_KEYBOARD1) },
|
||||||
{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,
|
{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,
|
||||||
|
|
Loading…
Reference in a new issue