Commit 0e1f37d1 authored by Aleix Roca Nonell's avatar Aleix Roca Nonell Committed by Benjamin Tissoires
Browse files

HID: asus: Add support for the ASUS T101HA keyboard dock 



The ASUS T101HA keyboard dock generates HID events using the ASUS vendor
specific UsagePage 0xff31. In consequence, some multimedia keys such as
brightness up and down are not working with hid-generic.

This commit adds the T101HA dock into the supported device list of the
hid-asus driver. It also prevents the dock's integrated touchpad to be
bound with hid-asus given that it is already working fine with
hid-multitouch.

Signed-off-by: default avatarAleix Roca Nonell <kernelrocks@gmail.com>
Signed-off-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
parent 2340bad5

drivers/hid/hid-asus.c

+8 −0
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ MODULE_DESCRIPTION("Asus HID Keyboard and TouchPad"); 
#define QUIRK_T100_KEYBOARD		BIT(6)

#define QUIRK_T100CHI			BIT(7)

#define QUIRK_G752_KEYBOARD		BIT(8)

#define QUIRK_T101HA_DOCK		BIT(9)



#define I2C_KEYBOARD_QUIRKS			(QUIRK_FIX_NOTEBOOK_REPORT | \

						 QUIRK_NO_INIT_REPORTS | \
@@ -699,6 +700,11 @@ static int asus_probe(struct hid_device *hdev, const struct hid_device_id *id) 
		return ret;

	}



	/* use hid-multitouch for T101HA touchpad */

	if (id->driver_data & QUIRK_T101HA_DOCK &&

	    hdev->collection->usage == HID_GD_MOUSE)

		return -ENODEV;



	ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT);

	if (ret) {

		hid_err(hdev, "Asus hw start failed: %d\n", ret);
@@ -830,6 +836,8 @@ static const struct hid_device_id asus_devices[] = { 
	{ 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_ASUSTEK,

		USB_DEVICE_ID_ASUSTEK_T101HA_KEYBOARD), QUIRK_T101HA_DOCK },

	{ 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) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_JESS, USB_DEVICE_ID_ASUS_MD_5112) },

drivers/hid/hid-ids.h

+1 −0
Original line number Diff line number Diff line
@@ -184,6 +184,7 @@ 
#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_T101HA_KEYBOARD	0x183d

#define USB_DEVICE_ID_ASUSTEK_T304_KEYBOARD	0x184a

#define USB_DEVICE_ID_ASUSTEK_I2C_KEYBOARD	0x8585

#define USB_DEVICE_ID_ASUSTEK_I2C_TOUCHPAD	0x0101

CRA Git | Maintained and supported by SUSTech CRA and CCSE