Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

HID: add USB IDs for MacBook 3rd generation

Add support for Macbook 3rd generation special mappings.

Signed-off-by: Tobias Mueller <Tobias_Mueller@twam.info>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

authored by

Tobias Mueller and committed by
Jiri Kosina
5906a044 be541ed1

+17
+5
drivers/hid/hid-input.c
··· 97 97 #define APPLE_FLAG_FKEY 0x01 98 98 99 99 static struct hidinput_key_translation apple_fn_keys[] = { 100 + { KEY_BACKSPACE, KEY_DELETE }, 100 101 { KEY_F1, KEY_BRIGHTNESSDOWN, APPLE_FLAG_FKEY }, 101 102 { KEY_F2, KEY_BRIGHTNESSUP, APPLE_FLAG_FKEY }, 102 103 { KEY_F3, KEY_CYCLEWINDOWS, APPLE_FLAG_FKEY }, /* Exposé */ ··· 110 109 { KEY_F10, KEY_MUTE, APPLE_FLAG_FKEY }, 111 110 { KEY_F11, KEY_VOLUMEDOWN, APPLE_FLAG_FKEY }, 112 111 { KEY_F12, KEY_VOLUMEUP, APPLE_FLAG_FKEY }, 112 + { KEY_UP, KEY_PAGEUP }, 113 + { KEY_DOWN, KEY_PAGEDOWN }, 114 + { KEY_LEFT, KEY_HOME }, 115 + { KEY_RIGHT, KEY_END }, 113 116 { } 114 117 }; 115 118
+12
drivers/hid/usbhid/hid-quirks.c
··· 66 66 #define USB_DEVICE_ID_APPLE_ALU_ANSI 0x0220 67 67 #define USB_DEVICE_ID_APPLE_ALU_ISO 0x0221 68 68 #define USB_DEVICE_ID_APPLE_ALU_JIS 0x0222 69 + #define USB_DEVICE_ID_APPLE_GEYSER4_HF_ANSI 0x0229 70 + #define USB_DEVICE_ID_APPLE_GEYSER4_HF_ISO 0x022a 71 + #define USB_DEVICE_ID_APPLE_GEYSER4_HF_JIS 0x022b 72 + #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI 0x022c 73 + #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_ISO 0x022d 74 + #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_JIS 0x022e 69 75 #define USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY 0x030a 70 76 #define USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY 0x030b 71 77 #define USB_DEVICE_ID_APPLE_IRCONTROL4 0x8242 ··· 623 617 { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_ANSI, HID_QUIRK_APPLE_HAS_FN }, 624 618 { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_ISO, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_APPLE_ISO_KEYBOARD }, 625 619 { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_JIS, HID_QUIRK_APPLE_HAS_FN }, 620 + { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_ANSI, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE }, 621 + { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_ISO, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE | HID_QUIRK_APPLE_ISO_KEYBOARD }, 622 + { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_JIS, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE }, 623 + { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI, HID_QUIRK_APPLE_HAS_FN }, 624 + { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ISO, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_APPLE_ISO_KEYBOARD }, 625 + { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_JIS, HID_QUIRK_APPLE_HAS_FN }, 626 626 { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE }, 627 627 { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE }, 628 628