hid-asus: add ROG Ally X prod ID to quirk list
PATCH 1/1 hid-asus: add ROG Ally X prod ID to quirk list
The new ASUS ROG Ally X functions almost exactly the same as the previous model, so we can use the same quirks.
--- drivers/hid/hid-asus.c | 3 +++ drivers/hid/hid-ids.h | 1 + 2 files changed, 4 insertions(+)
drivers/hid/hid-asus.c +3 -0
@@ -1255,6 +1255,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_AZOTH_KEYBOARD ), QUIRK_USE_KBD_BACKLIGHT | QUIRK_ROG_NKEY_KEYBOARD },
drivers/hid/hid-ids.h +1 -0
@@ -212,6 +212,7 @@#define USB_DEVICE_ID_ASUSTEK_ROG_RAIKIRI_PAD 0x1abb#define USB_DEVICE_ID_ASUSTEK_ROG_NKEY_ALLY 0x1abe#define USB_DEVICE_ID_ASUSTEK_ROG_AZOTH_KEYBOARD 0x1a83 +#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
Signature · 1 line
2.45.2
Jiri Kosina
maintainerQuoted 28 lines · Luke D. Jones
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 Luke D. Jones <[email protected]>--- drivers/hid/hid-asus.c | 3 +++ drivers/hid/hid-ids.h | 1 + 2 files changed, 4 insertions(+)drivers/hid/hid-asus.c +3
-0@@ -1255,6 +1255,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_AZOTH_KEYBOARD ), QUIRK_USE_KBD_BACKLIGHT | QUIRK_ROG_NKEY_KEYBOARD },drivers/hid/hid-ids.h +0
-0
drivers/hid/hid-ids.h line 215
Quoted 4 lines
drivers/hid/hid-ids.h +1
-0@@ -212,6 +212,7 @@#define USB_DEVICE_ID_ASUSTEK_ROG_RAIKIRI_PAD 0x1abb#define USB_DEVICE_ID_ASUSTEK_ROG_NKEY_ALLY 0x1abe#define USB_DEVICE_ID_ASUSTEK_ROG_AZOTH_KEYBOARD 0x1a83 +#define USB_DEVICE_ID_ASUSTEK_ROG_NKEY_ALLY_X 0x1b4c
I've applied the patch, but got a conflict here, because I don't see USB_DEVICE_ID_ASUSTEK_ROG_AZOTH_KEYBOARD in my tree, nor in Linus' tree. What tree was this patch generated against?
Signature · 2 lines
Jiri Kosina SUSE Labs
Quoted 30 lines · Jiri Kosina
Quoted 28 lines · Luke D. Jones
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 Luke D. Jones <[email protected]>--- drivers/hid/hid-asus.c | 3 +++ drivers/hid/hid-ids.h | 1 + 2 files changed, 4 insertions(+)drivers/hid/hid-asus.c +3
-0@@ -1255,6 +1255,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_AZOTH_KEYBOARD ), QUIRK_USE_KBD_BACKLIGHT | QUIRK_ROG_NKEY_KEYBOARD },drivers/hid/hid-ids.h +0
-0@@ -212,6 +212,7 @@
Quoted 8 lines
drivers/hid/hid-ids.h line 215
Quoted 4 lines
drivers/hid/hid-ids.h +1
-0#define USB_DEVICE_ID_ASUSTEK_ROG_RAIKIRI_PAD 0x1abb#define USB_DEVICE_ID_ASUSTEK_ROG_NKEY_ALLY 0x1abe#define USB_DEVICE_ID_ASUSTEK_ROG_AZOTH_KEYBOARD 0x1a83 +#define USB_DEVICE_ID_ASUSTEK_ROG_NKEY_ALLY_X 0x1b4cI've applied the patch, but got a conflict here, because I don't see
USB_DEVICE_ID_ASUSTEK_ROG_AZOTH_KEYBOARDin my tree, nor in Linus' tree. What tree was this patch generated against?
Apologies. I have a large tree of work for various asus devices. What you see should have been dropped but it looks like a git-rebase didn't go well.
Do you need me to regenerate it?
Jiri Kosina
maintainerQuoted 9 lines · Luke Jones
Quoted 3 lines
I've applied the patch, but got a conflict here, because I don't see
USB_DEVICE_ID_ASUSTEK_ROG_AZOTH_KEYBOARDin my tree, nor in Linus' tree. What tree was this patch generated against?Apologies. I have a large tree of work for various asus devices. What you see should have been dropped but it looks like a git-rebase didn't go well.
Do you need me to regenerate it?
No worries, I've fixed the conflict by hand, I was just wondering where this is coming from.
Thanks,
Signature · 2 lines
Jiri Kosina SUSE Labs