[PATCH] usbhid: Fix fn key on Macbook Pro 4,1 and Macbook Air

[PATCH] usbhid: Fix fn key on Macbook Pro 4,1 and Macbook Air

[alexander]

Added device ids to hid-quriks for detection of keyboards on 4th generation Macbook Pro and Macbook Air

Signed-off-by: Alexandre Karpenko <alexander@comm.utoronto.ca>
---
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/Contents/Info.plist
Patch was originally posted and tested at:
https://bugs.launchpad.net/mactel-support/+bug/207127

--- linux-source-2.6.24/drivers/hid/usbhid/hid-quirks.c.orig	2008-05-29 17:50:42.000000000 -0400
+++ linux-source-2.6.24/drivers/hid/usbhid/hid-quirks.c	2008-05-19 19:59:19.000000000 -0400
@@ -68,6 +68,12 @@
 #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_JIS   0x022e
+#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_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_GEYSER1_TP_ONLY	0x030b
 #define USB_DEVICE_ID_APPLE_IRCONTROL4	0x8242
@@ -572,6 +578,12 @@ static const struct hid_blacklist {
 	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI, HID_QUIRK_APPLE_HAS_FN },
 	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ISO, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_APPLE_ISO_KEYBOARD },
 	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_JIS, 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_HAS_FN | HID_QUIRK_IGNORE_MOUSE },
 	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },

Re: [PATCH] usbhid: Fix fn key on Macbook Pro 4,1 and Macbook Air

[Andrew Morton]

On Thu, 29 May 2008 18:46:37 -0400 (EDT)
alexander@comm.utoronto.ca wrote:

> Added device ids to hid-quriks for detection of keyboards on 4th generation Macbook Pro and Macbook Air

Thanks.

Jiri, I'll assume this this is destined for your tree.  Perhaps
suitable for 2.6.26?   I can merge it at your request, as always.

Re: [PATCH] usbhid: Fix fn key on Macbook Pro 4,1 and Macbook Air

[Jiri Kosina]

On Thu, 29 May 2008, Andrew Morton wrote:

> > Added device ids to hid-quriks for detection of keyboards on 4th 
> > generation Macbook Pro and Macbook Air
> Jiri, I'll assume this this is destined for your tree.  Perhaps
> suitable for 2.6.26?   I can merge it at your request, as always.

I will merge it through my tree, thanks.

-- 
Jiri Kosina
SUSE Labs