[PATCH] 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.

Signed-off-by: Luke D. Jones <luke@ljones.dev>
---
 drivers/hid/hid-asus.c | 3 +++
 drivers/hid/hid-ids.h  | 1 +
 2 files changed, 4 insertions(+)

diff --git a/drivers/hid/hid-asus.c b/drivers/hid/hid-asus.c
index 9010f12a221e..e5f6664bac0f 100644
--- a/drivers/hid/hid-asus.c
+++ b/drivers/hid/hid-asus.c

@@ -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 },

diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index fdf2d480533b..57f1f1bc5eb6 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h

@@ -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
 

-- 
2.45.2

On Thu, 25 Jul 2024, Luke D. Jones wrote:

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?

-- 
Jiri Kosina
SUSE Labs

On Fri, 2 Aug 2024, at 10:52 PM, Jiri Kosina wrote:

On Thu, 25 Jul 2024, Luke D. Jones wrote:

quoted

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 <luke@ljones.dev>
---
 drivers/hid/hid-asus.c | 3 +++
 drivers/hid/hid-ids.h  | 1 +
 2 files changed, 4 insertions(+)

diff --git a/drivers/hid/hid-asus.c b/drivers/hid/hid-asus.c
index 9010f12a221e..e5f6664bac0f 100644
--- a/drivers/hid/hid-asus.c
+++ b/drivers/hid/hid-asus.c

@@ -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 },

diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index fdf2d480533b..57f1f1bc5eb6 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h

@@ -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?

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?

On Tue, 6 Aug 2024, Luke Jones wrote:

quoted

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?

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,

-- 
Jiri Kosina
SUSE Labs