HID: add fn key support on Macbook Pro 4,1 and Macbook Air
Added device ids to hid-quriks for detection of keyboards on 4th generation Macbook Pro and Macbook Air The naming scheme is consistent with past Apple keyboards in hid-quirks; as defined by Apple (including device ids) in: /System/Library/Extensions/AppleUSBTopCase.kext/Contents/PlugIns/AppleUSBTCKeyboard.kext/Co ntents/Info.plist Patch was originally posted and tested at: https://bugs.launchpad.net/mactel-support/+bug/207127 Signed-off-by: Alexandre Karpenko <alexander@comm.utoronto.ca> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
This commit is contained in:
parent
9063974cdb
commit
37cdffdadf
|
@ -69,12 +69,18 @@
|
||||||
#define USB_DEVICE_ID_APPLE_ALU_ANSI 0x0220
|
#define USB_DEVICE_ID_APPLE_ALU_ANSI 0x0220
|
||||||
#define USB_DEVICE_ID_APPLE_ALU_ISO 0x0221
|
#define USB_DEVICE_ID_APPLE_ALU_ISO 0x0221
|
||||||
#define USB_DEVICE_ID_APPLE_ALU_JIS 0x0222
|
#define USB_DEVICE_ID_APPLE_ALU_JIS 0x0222
|
||||||
|
#define USB_DEVICE_ID_APPLE_WELLSPRING_ANSI 0x0223
|
||||||
|
#define USB_DEVICE_ID_APPLE_WELLSPRING_ISO 0x0224
|
||||||
|
#define USB_DEVICE_ID_APPLE_WELLSPRING_JIS 0x0225
|
||||||
#define USB_DEVICE_ID_APPLE_GEYSER4_HF_ANSI 0x0229
|
#define USB_DEVICE_ID_APPLE_GEYSER4_HF_ANSI 0x0229
|
||||||
#define USB_DEVICE_ID_APPLE_GEYSER4_HF_ISO 0x022a
|
#define USB_DEVICE_ID_APPLE_GEYSER4_HF_ISO 0x022a
|
||||||
#define USB_DEVICE_ID_APPLE_GEYSER4_HF_JIS 0x022b
|
#define USB_DEVICE_ID_APPLE_GEYSER4_HF_JIS 0x022b
|
||||||
#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI 0x022c
|
#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI 0x022c
|
||||||
#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_ISO 0x022d
|
#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_ISO 0x022d
|
||||||
#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_JIS 0x022e
|
#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_JIS 0x022e
|
||||||
|
#define USB_DEVICE_ID_APPLE_WELLSPRING2_ANSI 0x0230
|
||||||
|
#define USB_DEVICE_ID_APPLE_WELLSPRING2_ISO 0x0231
|
||||||
|
#define USB_DEVICE_ID_APPLE_WELLSPRING2_JIS 0x0232
|
||||||
#define USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY 0x030a
|
#define USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY 0x030a
|
||||||
#define USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY 0x030b
|
#define USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY 0x030b
|
||||||
#define USB_DEVICE_ID_APPLE_IRCONTROL4 0x8242
|
#define USB_DEVICE_ID_APPLE_IRCONTROL4 0x8242
|
||||||
|
@ -642,6 +648,12 @@ static const struct hid_blacklist {
|
||||||
{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN },
|
{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN },
|
||||||
{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ISO, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_APPLE_ISO_KEYBOARD },
|
{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ISO, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_APPLE_ISO_KEYBOARD },
|
||||||
{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_JIS, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN },
|
{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_JIS, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN },
|
||||||
|
{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ANSI, HID_QUIRK_APPLE_HAS_FN },
|
||||||
|
{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ISO, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_APPLE_ISO_KEYBOARD },
|
||||||
|
{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_JIS, HID_QUIRK_APPLE_HAS_FN },
|
||||||
|
{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_ANSI, HID_QUIRK_APPLE_HAS_FN },
|
||||||
|
{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_ISO, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_APPLE_ISO_KEYBOARD },
|
||||||
|
{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_JIS, HID_QUIRK_APPLE_HAS_FN },
|
||||||
{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },
|
{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },
|
||||||
{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },
|
{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue