| From 4a4c879904aa0cc64629e14a49b64fb3d149bf1a Mon Sep 17 00:00:00 2001 |
| From: Dan Bastone <dan@pwienterprises.com> |
| Date: Sun, 31 Jul 2011 07:40:49 -0400 |
| Subject: HID: add support for new revision of Apple aluminum keyboard |
| |
| From: Dan Bastone <dan@pwienterprises.com> |
| |
| commit 4a4c879904aa0cc64629e14a49b64fb3d149bf1a upstream. |
| |
| Add USB device ids for the new revision (MB110LL/B) of Apple's wired aluminum |
| keyboard. I have only confirmed that the ANSI version is correct - it is |
| assumed that the ISO and JIS versions follow the standard numbering convention. |
| |
| Signed-off-by: Dan Bastone <dan@pwienterprises.com> |
| Signed-off-by: Jiri Kosina <jkosina@suse.cz> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| drivers/hid/hid-apple.c | 6 ++++++ |
| drivers/hid/hid-core.c | 3 +++ |
| drivers/hid/hid-ids.h | 3 +++ |
| 3 files changed, 12 insertions(+) |
| |
| --- a/drivers/hid/hid-apple.c |
| +++ b/drivers/hid/hid-apple.c |
| @@ -444,6 +444,12 @@ static const struct hid_device_id apple_ |
| { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_JIS), |
| .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN | |
| APPLE_RDESC_JIS }, |
| + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_REVB_ANSI), |
| + .driver_data = APPLE_HAS_FN }, |
| + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_REVB_ISO), |
| + .driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD }, |
| + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_REVB_JIS), |
| + .driver_data = APPLE_HAS_FN }, |
| { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI), |
| .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN }, |
| { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ISO), |
| --- a/drivers/hid/hid-core.c |
| +++ b/drivers/hid/hid-core.c |
| @@ -1340,6 +1340,9 @@ static const struct hid_device_id hid_ha |
| { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_ANSI) }, |
| { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_ISO) }, |
| { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_JIS) }, |
| + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_REVB_ANSI) }, |
| + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_REVB_ISO) }, |
| + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_REVB_JIS) }, |
| { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI) }, |
| { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO) }, |
| { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS) }, |
| --- 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_ALU_REVB_ANSI 0x024f |
| +#define USB_DEVICE_ID_APPLE_ALU_REVB_ISO 0x0250 |
| +#define USB_DEVICE_ID_APPLE_ALU_REVB_JIS 0x0251 |
| #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI 0x0239 |
| #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO 0x023a |
| #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS 0x023b |
