Gökçen Eraslan wrote On 10/22/2011 10:39 PM:
> This patch adds keyboard support for Macbook Pro 8 models which has
> WELLSPRING5A model name and 0x0252, 0x0253 and 0x0254 USB IDs. Trackpad
> support for those models are added to bcm5974 in
> c331eb580a0a7906c0cdb8dbae3cfe99e3c0e555.
>
Any feedback on that?
> Signed-off-by: Gökçen Eraslan <gokcen@xxxxxxxxxxxxx>
> ---
> drivers/hid/hid-apple.c | 6 ++++++
> drivers/hid/hid-core.c | 6 ++++++
> drivers/hid/hid-ids.h | 9 ++++++---
> 3 files changed, 18 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c
> index 18b3bc6..4d8458e 100644
> --- a/drivers/hid/hid-apple.c
> +++ b/drivers/hid/hid-apple.c
> @@ -493,6 +493,12 @@ static const struct hid_device_id apple_devices[] = {
> .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_WELLSPRING5A_ANSI),
> + .driver_data = APPLE_HAS_FN },
> + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5A_ISO),
> + .driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD },
> + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5A_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),
> diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
> index 242353d..9a3fcc5 100644
> --- a/drivers/hid/hid-core.c
> +++ b/drivers/hid/hid-core.c
> @@ -1340,6 +1340,9 @@ static const struct hid_device_id hid_have_special_driver[] = {
> { 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_WELLSPRING5A_ANSI) },
> + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5A_ISO) },
> + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5A_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) },
> @@ -1892,6 +1895,9 @@ static const struct hid_device_id hid_mouse_ignore_list[] = {
> { 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_WELLSPRING5A_ANSI) },
> + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5A_ISO) },
> + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5A_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) },
> { }
> diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
> index 7d27d2b..2c281b6 100644
> --- a/drivers/hid/hid-ids.h
> +++ b/drivers/hid/hid-ids.h
> @@ -100,6 +100,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_WELLSPRING4_ANSI 0x023f
> #define USB_DEVICE_ID_APPLE_WELLSPRING4_ISO 0x0240
> #define USB_DEVICE_ID_APPLE_WELLSPRING4_JIS 0x0241
> @@ -112,9 +115,9 @@
> #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
> +#define USB_DEVICE_ID_APPLE_WELLSPRING5A_ANSI 0x0252
> +#define USB_DEVICE_ID_APPLE_WELLSPRING5A_ISO 0x0253
> +#define USB_DEVICE_ID_APPLE_WELLSPRING5A_JIS 0x0254
> #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
--
Gökçen Eraslan
Attachment:
signature.asc
Description: OpenPGP digital signature
