| From 5d922baa631058c7e37ae33e81c4d3e6437f8d1d Mon Sep 17 00:00:00 2001 |
| From: "Joshua V. Dillon" <jvdillon@gmail.com> |
| Date: Fri, 5 Aug 2011 12:05:22 -0700 |
| Subject: HID: add support for MacBookAir4,2 keyboard. |
| |
| From: "Joshua V. Dillon" <jvdillon@gmail.com> |
| |
| commit 5d922baa631058c7e37ae33e81c4d3e6437f8d1d upstream. |
| |
| Added USB device IDs for MacBookAir4,2 keyboard. Device constants were |
| copied from the MacBookAir3,2 constants. The 4,2 device specification is |
| reportedly unchanged from the 3,2 predecessor and seems to work well. |
| |
| Signed-off-by: Joshua V Dillon <jvdillon@gmail.com> |
| Signed-off-by: Chase Douglas <chase.douglas@canonical.com> |
| Signed-off-by: Jiri Kosina <jkosina@suse.cz> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| drivers/hid/hid-apple.c | 9 +++++++++ |
| drivers/hid/hid-ids.h | 3 +++ |
| 2 files changed, 12 insertions(+) |
| |
| --- a/drivers/hid/hid-apple.c |
| +++ b/drivers/hid/hid-apple.c |
| @@ -183,6 +183,9 @@ static int hidinput_apple_event(struct h |
| if (hid->product >= USB_DEVICE_ID_APPLE_WELLSPRING4_ANSI && |
| hid->product <= USB_DEVICE_ID_APPLE_WELLSPRING4A_JIS) |
| table = macbookair_fn_keys; |
| + else if (hid->product >= USB_DEVICE_ID_APPLE_WELLSPRING6_ANSI && |
| + hid->product <= USB_DEVICE_ID_APPLE_WELLSPRING6_JIS) |
| + table = macbookair_fn_keys; |
| else if (hid->product < 0x21d || hid->product >= 0x300) |
| table = powerbook_fn_keys; |
| else |
| @@ -493,6 +496,12 @@ static const struct hid_device_id apple_ |
| .driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD }, |
| { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_JIS), |
| .driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS }, |
| + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6_ANSI), |
| + .driver_data = APPLE_HAS_FN }, |
| + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6_ISO), |
| + .driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD }, |
| + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6_JIS), |
| + .driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS }, |
| { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI), |
| .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN }, |
| { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO), |
| --- a/drivers/hid/hid-ids.h |
| +++ b/drivers/hid/hid-ids.h |
| @@ -109,6 +109,9 @@ |
| #define USB_DEVICE_ID_APPLE_WELLSPRING5_ANSI 0x0245 |
| #define USB_DEVICE_ID_APPLE_WELLSPRING5_ISO 0x0246 |
| #define USB_DEVICE_ID_APPLE_WELLSPRING5_JIS 0x0247 |
| +#define USB_DEVICE_ID_APPLE_WELLSPRING6_ANSI 0x024c |
| +#define USB_DEVICE_ID_APPLE_WELLSPRING6_ISO 0x024d |
| +#define USB_DEVICE_ID_APPLE_WELLSPRING6_JIS 0x024e |
| #define USB_DEVICE_ID_APPLE_ALU_REVB_ANSI 0x024f |
| #define USB_DEVICE_ID_APPLE_ALU_REVB_ISO 0x0250 |
| #define USB_DEVICE_ID_APPLE_ALU_REVB_JIS 0x0251 |
