mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-21 08:19:28 +00:00
Merge branch 'for-6.5/acer' into for-linus
- ASUS ROG Z13 keyboard support and other assorted fixes to hid-asus (Luke D. Jones)
This commit is contained in:
commit
e7de761b02
2 changed files with 17 additions and 26 deletions
|
@ -884,33 +884,20 @@ static int asus_input_mapping(struct hid_device *hdev,
|
|||
case 0xb5: asus_map_key_clear(KEY_CALC); break;
|
||||
case 0xc4: asus_map_key_clear(KEY_KBDILLUMUP); break;
|
||||
case 0xc5: asus_map_key_clear(KEY_KBDILLUMDOWN); break;
|
||||
case 0xc7: asus_map_key_clear(KEY_KBDILLUMTOGGLE); break;
|
||||
|
||||
/* ASUS touchpad toggle */
|
||||
case 0x6b: asus_map_key_clear(KEY_F21); break;
|
||||
case 0x6b: asus_map_key_clear(KEY_F21); break; /* ASUS touchpad toggle */
|
||||
case 0x38: asus_map_key_clear(KEY_PROG1); break; /* ROG key */
|
||||
case 0xba: asus_map_key_clear(KEY_PROG2); break; /* Fn+C ASUS Splendid */
|
||||
case 0x5c: asus_map_key_clear(KEY_PROG3); break; /* Fn+Space Power4Gear */
|
||||
case 0x99: asus_map_key_clear(KEY_PROG4); break; /* Fn+F5 "fan" symbol */
|
||||
case 0xae: asus_map_key_clear(KEY_PROG4); break; /* Fn+F5 "fan" symbol */
|
||||
case 0x92: asus_map_key_clear(KEY_CALC); break; /* Fn+Ret "Calc" symbol */
|
||||
case 0xb2: asus_map_key_clear(KEY_PROG2); break; /* Fn+Left previous aura */
|
||||
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 */
|
||||
|
||||
/* ROG key */
|
||||
case 0x38: asus_map_key_clear(KEY_PROG1); break;
|
||||
|
||||
/* Fn+C ASUS Splendid */
|
||||
case 0xba: asus_map_key_clear(KEY_PROG2); break;
|
||||
|
||||
/* Fn+Space Power4Gear Hybrid */
|
||||
case 0x5c: asus_map_key_clear(KEY_PROG3); break;
|
||||
|
||||
/* Fn+F5 "fan" symbol on FX503VD */
|
||||
case 0x99: asus_map_key_clear(KEY_PROG4); break;
|
||||
|
||||
/* Fn+F5 "fan" symbol on N-Key keyboard */
|
||||
case 0xae: asus_map_key_clear(KEY_PROG4); break;
|
||||
|
||||
/* Fn+Ret "Calc" symbol on N-Key keyboard */
|
||||
case 0x92: asus_map_key_clear(KEY_CALC); break;
|
||||
|
||||
/* Fn+Left Aura mode previous on N-Key keyboard */
|
||||
case 0xb2: asus_map_key_clear(KEY_PROG2); break;
|
||||
|
||||
/* Fn+Right Aura mode next on N-Key keyboard */
|
||||
case 0xb3: asus_map_key_clear(KEY_PROG3); break;
|
||||
|
||||
default:
|
||||
/* ASUS lazily declares 256 usages, ignore the rest,
|
||||
|
@ -1268,6 +1255,9 @@ static const struct hid_device_id asus_devices[] = {
|
|||
{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,
|
||||
USB_DEVICE_ID_ASUSTEK_ROG_NKEY_KEYBOARD2),
|
||||
QUIRK_USE_KBD_BACKLIGHT | QUIRK_ROG_NKEY_KEYBOARD },
|
||||
{ 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_CLAYMORE_II_KEYBOARD),
|
||||
QUIRK_ROG_CLAYMORE_II_KEYBOARD },
|
||||
|
@ -1310,4 +1300,4 @@ static struct hid_driver asus_driver = {
|
|||
};
|
||||
module_hid_driver(asus_driver);
|
||||
|
||||
MODULE_LICENSE("GPL");
|
||||
MODULE_LICENSE("GPL");
|
|
@ -207,6 +207,7 @@
|
|||
#define USB_DEVICE_ID_ASUSTEK_ROG_KEYBOARD3 0x1822
|
||||
#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_CLAYMORE_II_KEYBOARD 0x196b
|
||||
#define USB_DEVICE_ID_ASUSTEK_FX503VD_KEYBOARD 0x1869
|
||||
|
||||
|
|
Loading…
Reference in a new issue