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

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: Luke D. Jones <luke@ljones.dev>
Signed-off-by: Jiri Kosina <jkosina@suse.com>

diff --git a/drivers/hid/hid-asus.c b/drivers/hid/hid-asus.c
index 18062f9804fb6e7e1d8f3900bce2703d916ae90e..61820f7a6b25d63ef32da8a39bedd8559b144d13 100644 (file)
--- a/drivers/hid/hid-asus.c
+++ b/drivers/hid/hid-asus.c
@@ -847,7 +847,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,
@@ -1239,6 +1242,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 },

diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 8376fb5e2d0b406c84e6dea1fd7f43b2b54ef975..f1e508a7ef06168b920137c8855b3a80d27a8317 100644 (file)
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -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