| From 23aeb61e7e1f02fb0f3b8f9e798e75537ca1731d Mon Sep 17 00:00:00 2001 |
| From: Christian Schuerer-Waldheim <csw@xray.at> |
| Date: Wed, 6 Jan 2010 14:49:57 +0100 |
| Subject: HID: add device IDs for new model of Apple Wireless Keyboard |
| |
| From: Christian Schuerer-Waldheim <csw@xray.at> |
| |
| commit 23aeb61e7e1f02fb0f3b8f9e798e75537ca1731d upstream. |
| |
| Added device IDs for the new model of the Apple Wireless Keyboard |
| (November 2009). |
| |
| Signed-off-by: Christian Schuerer-Waldheim <csw@xray.at> |
| Signed-off-by: Jiri Kosina <jkosina@suse.cz> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| drivers/hid/hid-apple.c | 7 +++++++ |
| drivers/hid/hid-core.c | 3 +++ |
| drivers/hid/hid-ids.h | 3 +++ |
| 3 files changed, 13 insertions(+) |
| |
| --- a/drivers/hid/hid-apple.c |
| +++ b/drivers/hid/hid-apple.c |
| @@ -431,6 +431,13 @@ 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_WELLSPRING3_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), |
| + .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN | |
| + APPLE_ISO_KEYBOARD }, |
| + { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS), |
| + .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN }, |
| { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY), |
| .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN }, |
| { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY), |
| --- a/drivers/hid/hid-core.c |
| +++ b/drivers/hid/hid-core.c |
| @@ -1287,6 +1287,9 @@ static const struct hid_device_id hid_bl |
| { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING3_ANSI) }, |
| { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING3_ISO) }, |
| { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING3_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) }, |
| { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY) }, |
| { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) }, |
| { HID_USB_DEVICE(USB_VENDOR_ID_BELKIN, USB_DEVICE_ID_FLIP_KVM) }, |
| --- a/drivers/hid/hid-ids.h |
| +++ b/drivers/hid/hid-ids.h |
| @@ -88,6 +88,9 @@ |
| #define USB_DEVICE_ID_APPLE_WELLSPRING3_ANSI 0x0236 |
| #define USB_DEVICE_ID_APPLE_WELLSPRING3_ISO 0x0237 |
| #define USB_DEVICE_ID_APPLE_WELLSPRING3_JIS 0x0238 |
| +#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 |
| #define USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY 0x030a |
| #define USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY 0x030b |
| #define USB_DEVICE_ID_APPLE_ATV_IRCONTROL 0x8241 |