Commit b595974b authored by Antheas Kapenekakis's avatar Antheas Kapenekakis Committed by Jiri Kosina
Browse files

HID: asus: add Z13 folio to generic group for multitouch to work 



The Asus Z13 folio has a multitouch touchpad that needs to bind
to the hid-multitouch driver in order to work properly. So bind
it to the HID_GROUP_GENERIC group to release the touchpad and
move it to the bottom so that the comment applies to it.

While at it, change the generic KEYBOARD3 name to Z13_FOLIO.

Reviewed-by: default avatarLuke D. Jones <luke@ljones.dev>
Signed-off-by: default avatarAntheas Kapenekakis <lkml@antheas.dev>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.com>
parent 02d6eeed

drivers/hid/hid-asus.c

+3 −3
Original line number Diff line number Diff line
@@ -1384,9 +1384,6 @@ static const struct hid_device_id asus_devices[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,

	    USB_DEVICE_ID_ASUSTEK_ROG_NKEY_KEYBOARD2),

	  QUIRK_USE_KBD_BACKLIGHT | QUIRK_ROG_NKEY_KEYBOARD },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,

	    USB_DEVICE_ID_ASUSTEK_ROG_NKEY_KEYBOARD3),

	  QUIRK_USE_KBD_BACKLIGHT | QUIRK_ROG_NKEY_KEYBOARD },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,

	    USB_DEVICE_ID_ASUSTEK_ROG_Z13_LIGHTBAR),

	  QUIRK_USE_KBD_BACKLIGHT | QUIRK_ROG_NKEY_KEYBOARD },
@@ -1416,6 +1413,9 @@ static const struct hid_device_id asus_devices[] = { 
	 * Note bind to the HID_GROUP_GENERIC group, so that we only bind to the keyboard

	 * part, while letting hid-multitouch.c handle the touchpad.

	 */

	{ HID_DEVICE(BUS_USB, HID_GROUP_GENERIC,

		USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_ROG_Z13_FOLIO),

	  QUIRK_USE_KBD_BACKLIGHT | QUIRK_ROG_NKEY_KEYBOARD },

	{ HID_DEVICE(BUS_USB, HID_GROUP_GENERIC,

		USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_T101HA_KEYBOARD) },

	{ }

drivers/hid/hid-ids.h

+1 −1
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ 
#define USB_DEVICE_ID_ASUSTEK_ROG_KEYBOARD3 0x1822

#define USB_DEVICE_ID_ASUSTEK_ROG_NKEY_KEYBOARD	0x1866

#define USB_DEVICE_ID_ASUSTEK_ROG_NKEY_KEYBOARD2	0x19b6

#define USB_DEVICE_ID_ASUSTEK_ROG_NKEY_KEYBOARD3	0x1a30

#define USB_DEVICE_ID_ASUSTEK_ROG_Z13_FOLIO		0x1a30

#define USB_DEVICE_ID_ASUSTEK_ROG_Z13_LIGHTBAR		0x18c6

#define USB_DEVICE_ID_ASUSTEK_ROG_NKEY_ALLY		0x1abe

#define USB_DEVICE_ID_ASUSTEK_ROG_NKEY_ALLY_X		0x1b4c