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

hid-asus: add ROG Ally X prod ID to quirk list 

stable inclusion
from stable-v6.6.57
commit ea912d384d8e117b563aa428625de104afed66ca
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=ea912d384d8e117b563aa428625de104afed66ca



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

[ Upstream commit d1aa95e86f178dc597e80228cd9bd81fc3510f34 ]

The new ASUS ROG Ally X functions almost exactly the same as the previous
model, so we can use the same quirks.

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 f90a0042

drivers/hid/hid-asus.c

+3 −0
Original line number Diff line number Diff line
@@ -1282,6 +1282,9 @@ static const struct hid_device_id asus_devices[] = { 
	{ 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_NKEY_ALLY_X),

	  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
@@ -210,6 +210,7 @@ 
#define USB_DEVICE_ID_ASUSTEK_ROG_NKEY_KEYBOARD3	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

#define USB_DEVICE_ID_ASUSTEK_ROG_CLAYMORE_II_KEYBOARD	0x196b

#define USB_DEVICE_ID_ASUSTEK_FX503VD_KEYBOARD	0x1869