Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bc786dfe authored by Hans de Goede's avatar Hans de Goede Committed by Greg Kroah-Hartman
Browse files

HID: asus: Add support for multi-touch touchpad on Medion Akoya E1239T 



[ Upstream commit e271f6c2df78d60dd4873c790a51dba40e6dfb72 ]

The multi-touch touchpad found on the Medion Akoya E1239T's keyboard-dock,
uses the same custom multi-touch protocol as the Asus keyboard-docks
(same chipset vendor, Integrated Technology Express / ITE).

Add support for this using the existing multi-touch touchpad support in
the hid-asus driver.

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
Stable-dep-of: 4ab3a086d10e ("HID: asus: use spinlock to safely schedule workers")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent bad4a822

drivers/hid/hid-asus.c

+25 −1
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ MODULE_AUTHOR("Frederik Wenigwieser <frederik.wenigwieser@gmail.com>"); 
MODULE_DESCRIPTION("Asus HID Keyboard and TouchPad");



#define T100_TPAD_INTF 2

#define MEDION_E1239T_TPAD_INTF 1



#define T100CHI_MOUSE_REPORT_ID 0x06

#define FEATURE_REPORT_ID 0x0d
@@ -77,6 +78,7 @@ MODULE_DESCRIPTION("Asus HID Keyboard and TouchPad"); 
#define QUIRK_G752_KEYBOARD		BIT(8)

#define QUIRK_T101HA_DOCK		BIT(9)

#define QUIRK_T90CHI			BIT(10)

#define QUIRK_MEDION_E1239T		BIT(11)



#define I2C_KEYBOARD_QUIRKS			(QUIRK_FIX_NOTEBOOK_REPORT | \

						 QUIRK_NO_INIT_REPORTS | \
@@ -171,6 +173,16 @@ static const struct asus_touchpad_info asus_t100chi_tp = { 
	.report_size = 15 /* 2 byte header + 3 * 4 + 1 byte footer */,

};



static const struct asus_touchpad_info medion_e1239t_tp = {

	.max_x = 2640,

	.max_y = 1380,

	.res_x = 29, /* units/mm */

	.res_y = 28, /* units/mm */

	.contact_size = 5,

	.max_contacts = 5,

	.report_size = 32 /* 2 byte header + 5 * 5 + 5 byte footer */,

};



static void asus_report_contact_down(struct asus_drvdata *drvdat,

		int toolType, u8 *data)

{
@@ -903,6 +915,17 @@ static int asus_probe(struct hid_device *hdev, const struct hid_device_id *id) 
		drvdata->tp = &asus_t100chi_tp;

	}



	if ((drvdata->quirks & QUIRK_MEDION_E1239T) &&

	    hid_is_using_ll_driver(hdev, &usb_hid_driver)) {

		struct usb_host_interface *alt =

			to_usb_interface(hdev->dev.parent)->altsetting;



		if (alt->desc.bInterfaceNumber == MEDION_E1239T_TPAD_INTF) {

			drvdata->quirks |= QUIRK_SKIP_INPUT_MAPPING;

			drvdata->tp = &medion_e1239t_tp;

		}

	}



	if (drvdata->quirks & QUIRK_NO_INIT_REPORTS)

		hdev->quirks |= HID_QUIRK_NO_INIT_REPORTS;
@@ -1086,7 +1109,8 @@ static const struct hid_device_id asus_devices[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_JESS, USB_DEVICE_ID_ASUS_MD_5112) },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_ASUSTEK,

		USB_DEVICE_ID_ASUSTEK_T100CHI_KEYBOARD), QUIRK_T100CHI },



	{ HID_USB_DEVICE(USB_VENDOR_ID_ITE, USB_DEVICE_ID_ITE_MEDION_E1239T),

		QUIRK_MEDION_E1239T },

	{ }

};

MODULE_DEVICE_TABLE(hid, asus_devices);

drivers/hid/hid-ids.h

+1 −0
Original line number Diff line number Diff line
@@ -650,6 +650,7 @@ 
#define I2C_DEVICE_ID_ITE_LENOVO_LEGION_Y720	0x837a

#define USB_DEVICE_ID_ITE_LENOVO_YOGA900	0x8396

#define USB_DEVICE_ID_ITE8595		0x8595

#define USB_DEVICE_ID_ITE_MEDION_E1239T	0xce50



#define USB_VENDOR_ID_JABRA		0x0b0e

#define USB_DEVICE_ID_JABRA_SPEAK_410	0x0412