diff options
-rw-r--r-- | drivers/hid/hid-asus.c | 7 | ||||
-rw-r--r-- | drivers/hid/hid-ids.h | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/drivers/hid/hid-asus.c b/drivers/hid/hid-asus.c index 61fb5a43c1cb..ab8bd40a77ed 100644 --- a/drivers/hid/hid-asus.c +++ b/drivers/hid/hid-asus.c | |||
@@ -522,6 +522,7 @@ static int asus_input_mapping(struct hid_device *hdev, | |||
522 | case 0x20: asus_map_key_clear(KEY_BRIGHTNESSUP); break; | 522 | case 0x20: asus_map_key_clear(KEY_BRIGHTNESSUP); break; |
523 | case 0x35: asus_map_key_clear(KEY_DISPLAY_OFF); break; | 523 | case 0x35: asus_map_key_clear(KEY_DISPLAY_OFF); break; |
524 | case 0x6c: asus_map_key_clear(KEY_SLEEP); break; | 524 | case 0x6c: asus_map_key_clear(KEY_SLEEP); break; |
525 | case 0x7c: asus_map_key_clear(KEY_MICMUTE); break; | ||
525 | case 0x82: asus_map_key_clear(KEY_CAMERA); break; | 526 | case 0x82: asus_map_key_clear(KEY_CAMERA); break; |
526 | case 0x88: asus_map_key_clear(KEY_RFKILL); break; | 527 | case 0x88: asus_map_key_clear(KEY_RFKILL); break; |
527 | case 0xb5: asus_map_key_clear(KEY_CALC); break; | 528 | case 0xb5: asus_map_key_clear(KEY_CALC); break; |
@@ -540,6 +541,9 @@ static int asus_input_mapping(struct hid_device *hdev, | |||
540 | /* Fn+Space Power4Gear Hybrid */ | 541 | /* Fn+Space Power4Gear Hybrid */ |
541 | case 0x5c: asus_map_key_clear(KEY_PROG3); break; | 542 | case 0x5c: asus_map_key_clear(KEY_PROG3); break; |
542 | 543 | ||
544 | /* Fn+F5 "fan" symbol on FX503VD */ | ||
545 | case 0x99: asus_map_key_clear(KEY_PROG4); break; | ||
546 | |||
543 | default: | 547 | default: |
544 | /* ASUS lazily declares 256 usages, ignore the rest, | 548 | /* ASUS lazily declares 256 usages, ignore the rest, |
545 | * as some make the keyboard appear as a pointer device. */ | 549 | * as some make the keyboard appear as a pointer device. */ |
@@ -818,6 +822,9 @@ static const struct hid_device_id asus_devices[] = { | |||
818 | { HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK, | 822 | { HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK, |
819 | USB_DEVICE_ID_ASUSTEK_ROG_KEYBOARD3), QUIRK_G752_KEYBOARD }, | 823 | USB_DEVICE_ID_ASUSTEK_ROG_KEYBOARD3), QUIRK_G752_KEYBOARD }, |
820 | { HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK, | 824 | { HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK, |
825 | USB_DEVICE_ID_ASUSTEK_FX503VD_KEYBOARD), | ||
826 | QUIRK_USE_KBD_BACKLIGHT }, | ||
827 | { HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK, | ||
821 | USB_DEVICE_ID_ASUSTEK_T100TA_KEYBOARD), | 828 | USB_DEVICE_ID_ASUSTEK_T100TA_KEYBOARD), |
822 | QUIRK_T100_KEYBOARD | QUIRK_NO_CONSUMER_USAGES }, | 829 | QUIRK_T100_KEYBOARD | QUIRK_NO_CONSUMER_USAGES }, |
823 | { HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK, | 830 | { HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK, |
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index ed35c9a9a110..4206428c0ba2 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h | |||
@@ -190,6 +190,7 @@ | |||
190 | #define USB_DEVICE_ID_ASUSTEK_ROG_KEYBOARD1 0x1854 | 190 | #define USB_DEVICE_ID_ASUSTEK_ROG_KEYBOARD1 0x1854 |
191 | #define USB_DEVICE_ID_ASUSTEK_ROG_KEYBOARD2 0x1837 | 191 | #define USB_DEVICE_ID_ASUSTEK_ROG_KEYBOARD2 0x1837 |
192 | #define USB_DEVICE_ID_ASUSTEK_ROG_KEYBOARD3 0x1822 | 192 | #define USB_DEVICE_ID_ASUSTEK_ROG_KEYBOARD3 0x1822 |
193 | #define USB_DEVICE_ID_ASUSTEK_FX503VD_KEYBOARD 0x1869 | ||
193 | 194 | ||
194 | #define USB_VENDOR_ID_ATEN 0x0557 | 195 | #define USB_VENDOR_ID_ATEN 0x0557 |
195 | #define USB_DEVICE_ID_ATEN_UC100KM 0x2004 | 196 | #define USB_DEVICE_ID_ATEN_UC100KM 0x2004 |