diff options
author | Dmitry Torokhov <rydberg@euromail.se> | 2013-07-01 14:46:27 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-21 21:21:29 -0400 |
commit | 391c2e14c6442ac370afee2674d3e0c7409b319d (patch) | |
tree | 61d26b9498097d2aae6feac05cbf216d8528d3b7 /drivers/hid/hid-apple.c | |
parent | 2757f8d630ae099abc7d51b7b09de76a33876bf4 (diff) |
HID: apple: Add support for the 2013 Macbook Air
commit 9d9a04ee758b4c1fcc7586d065cdde7a7607e156 upstream.
This patch adds keyboard support for MacbookAir6,2 as WELLSPRING8
(0x0291, 0x0292, 0x0293). The touchpad is handled in a separate
bcm5974 patch, as usual.
Reported-and-tested-by: Brad Ford <plymouthffl@gmail.com>
Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/hid/hid-apple.c')
-rw-r--r-- | drivers/hid/hid-apple.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c index feae88b53fcd..c7710b5c69af 100644 --- a/drivers/hid/hid-apple.c +++ b/drivers/hid/hid-apple.c | |||
@@ -524,6 +524,12 @@ static const struct hid_device_id apple_devices[] = { | |||
524 | .driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD }, | 524 | .driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD }, |
525 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING7A_JIS), | 525 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING7A_JIS), |
526 | .driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS }, | 526 | .driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS }, |
527 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING8_ANSI), | ||
528 | .driver_data = APPLE_HAS_FN }, | ||
529 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING8_ISO), | ||
530 | .driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD }, | ||
531 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING8_JIS), | ||
532 | .driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS }, | ||
527 | { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI), | 533 | { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI), |
528 | .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN }, | 534 | .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN }, |
529 | { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO), | 535 | { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO), |