Re: [PATCH] MacBook Pro Retina Keyboard Support

Re: [PATCH] MacBook Pro Retina Keyboard Support

[Henrik Rydberg]

Hi Ryan,

Please keep the patch message clear of things you do not want to end
up in the git log. Also, if you could manage to get an Originally-by:
or Tested-by from the right person, that would be splendid.

Jiri, unless you already have this patch from elsewhere, it would be
great to see it in 3.5. :-)

Thanks,
Henrik

Re: [PATCH] MacBook Pro Retina Keyboard Support

[Jiri Kosina]

On Mon, 9 Jul 2012, Henrik Rydberg wrote:

> Please keep the patch message clear of things you do not want to end
> up in the git log. Also, if you could manage to get an Originally-by:
> or Tested-by from the right person, that would be splendid.

Also, Ryan, the patch has been corrupted (line-wrapping), likely by your 
mail client, so I can't apply it as-is.

Could you please fix that up, and resend?

Thanks,

-- 
Jiri Kosina
SUSE Labs

Re: [PATCH] MacBook Pro Retina Keyboard Support

[Henrik Rydberg]

On Tue, Jul 10, 2012 at 11:48:00AM +0200, Jiri Kosina wrote:
> On Mon, 9 Jul 2012, Henrik Rydberg wrote:
> 
> > Please keep the patch message clear of things you do not want to end
> > up in the git log. Also, if you could manage to get an Originally-by:
> > or Tested-by from the right person, that would be splendid.
> 
> Also, Ryan, the patch has been corrupted (line-wrapping), likely by your 
> mail client, so I can't apply it as-is.
> 
> Could you please fix that up, and resend?

Since it seemed reasonable to add the mouse-ignore lines to the same
patch, I fixed up the patch in the process and resent yesterday.

Thanks,
Henrik

Re: [PATCH] MacBook Pro Retina Keyboard Support

[Ryan Bourgeois]

On Tue, Jul 10, 2012 at 5:06 AM, Henrik Rydberg <rydberg@bitmath.se> wrote:
> On Tue, Jul 10, 2012 at 11:48:00AM +0200, Jiri Kosina wrote:
>> On Mon, 9 Jul 2012, Henrik Rydberg wrote:
>>
>> > Please keep the patch message clear of things you do not want to end
>> > up in the git log. Also, if you could manage to get an Originally-by:
>> > or Tested-by from the right person, that would be splendid.
>>
>> Also, Ryan, the patch has been corrupted (line-wrapping), likely by your
>> mail client, so I can't apply it as-is.
>>
>> Could you please fix that up, and resend?
>
> Since it seemed reasonable to add the mouse-ignore lines to the same
> patch, I fixed up the patch in the process and resent yesterday.
>
> Thanks,
> Henrik

Thanks, Henrik. I wasn't aware of the mouse ignore changes. I had
written and tested the keyboard patch before I discovered the patches
on the OpenSUSE forums. I had not tested the trackpad changes myself
which is why I did not include them. I've been fiddling around with
the hybrid graphics support so I haven't run an X session on the
laptop yet.

-Ryan

[PATCH] MacBook Pro Retina Keyboard Support

[Ryan Bourgeois]

This is a patch to enable full keyboard support for the MacBook Pro
Retina. It enables the function key shortcuts present in previous
MacBook iterations. The patch is against 3.5-r6.


diff -urNp a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c
--- a/drivers/hid/hid-apple.c	2012-07-08 00:32:24.923451001 -0500
+++ b/drivers/hid/hid-apple.c	2012-07-08 00:35:16.763450998 -0500
@@ -517,6 +517,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_WELLSPRING5A_JIS),
 		.driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS },
+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING7_ANSI),
+		.driver_data = APPLE_HAS_FN },
+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING7_ISO),
+		.driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD },
+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING7_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 -urNp a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
--- a/drivers/hid/hid-core.c	2012-07-08 00:32:24.927451001 -0500
+++ b/drivers/hid/hid-core.c	2012-07-08 00:38:08.946451088 -0500
@@ -1503,6 +1503,9 @@ static const struct hid_device_id hid_ha
 	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE,
USB_DEVICE_ID_APPLE_WELLSPRING6A_ANSI) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6A_ISO) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6A_JIS) },
+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING7_ANSI) },
+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING7_ISO) },
+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING7_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) },
diff -urNp a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
--- a/drivers/hid/hid-ids.h	2012-07-08 00:32:24.926451001 -0500
+++ b/drivers/hid/hid-ids.h	2012-07-08 00:34:31.641450978 -0500
@@ -125,6 +125,9 @@
 #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_WELLSPRING7_ANSI	0x0262
+#define USB_DEVICE_ID_APPLE_WELLSPRING7_ISO	0x0263
+#define USB_DEVICE_ID_APPLE_WELLSPRING7_JIS	0x0264
 #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


Signed-off-by: Ryan Bourgeois <bluedragonx@gmail.com>