Commit f71d4953 authored by Luke D. Jones's avatar Luke D. Jones Committed by Wen Zhiwei
Browse files

HID: asus: add ROG Ally N-Key ID and keycodes 

stable inclusion
from stable-v6.6.57
commit 5ec4596a0ba9a80309b0e0b1c18d1fc82c31ac43
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IB2M97

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=5ec4596a0ba9a80309b0e0b1c18d1fc82c31ac43



--------------------------------

[ Upstream commit 08b50c6b0b0940a304b481346cc187d489c6a751 ]

A handful of buttons on the ROG Ally are not actually part of the xpad
device and are instead keyboard keys (a typical use of the MCU that asus
uses). We attach a group of F<num> key codes which aren't used much and
which the handheld community has already accepted as defaults here.

Signed-off-by: default avatarLuke D. Jones <luke@ljones.dev>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarWen Zhiwei <wenzhiwei@kylinos.cn>
parent af7d54a4

drivers/hid/hid-asus.c

+7 −1
Original line number Diff line number Diff line
@@ -881,7 +881,10 @@ static int asus_input_mapping(struct hid_device *hdev, 
		case 0xb3: asus_map_key_clear(KEY_PROG3);	break; /* Fn+Left next aura */

		case 0x6a: asus_map_key_clear(KEY_F13);		break; /* Screenpad toggle */

		case 0x4b: asus_map_key_clear(KEY_F14);		break; /* Arrows/Pg-Up/Dn toggle */



		case 0xa5: asus_map_key_clear(KEY_F15);		break; /* ROG Ally left back */

		case 0xa6: asus_map_key_clear(KEY_F16);		break; /* ROG Ally QAM button */

		case 0xa7: asus_map_key_clear(KEY_F17);		break; /* ROG Ally ROG long-press */

		case 0xa8: asus_map_key_clear(KEY_F18);		break; /* ROG Ally ROG long-press-release */



		default:

			/* ASUS lazily declares 256 usages, ignore the rest,
@@ -1273,6 +1276,9 @@ static const struct hid_device_id asus_devices[] = { 
	{ 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_NKEY_ALLY),

	  QUIRK_USE_KBD_BACKLIGHT | QUIRK_ROG_NKEY_KEYBOARD },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,

	    USB_DEVICE_ID_ASUSTEK_ROG_CLAYMORE_II_KEYBOARD),

	  QUIRK_ROG_CLAYMORE_II_KEYBOARD },

drivers/hid/hid-ids.h

+1 −0
Original line number Diff line number Diff line
@@ -208,6 +208,7 @@ 
#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_NKEY_ALLY		0x1abe

#define USB_DEVICE_ID_ASUSTEK_ROG_CLAYMORE_II_KEYBOARD	0x196b

#define USB_DEVICE_ID_ASUSTEK_FX503VD_KEYBOARD	0x1869