From patchwork Mon Jul 9 02:36:33 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Bourgeois X-Patchwork-Id: 1170611 Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 51FF540B21 for ; Mon, 9 Jul 2012 02:48:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751580Ab2GICgf (ORCPT ); Sun, 8 Jul 2012 22:36:35 -0400 Received: from mail-wi0-f178.google.com ([209.85.212.178]:54201 "EHLO mail-wi0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751508Ab2GICgf (ORCPT ); Sun, 8 Jul 2012 22:36:35 -0400 Received: by wibhr14 with SMTP id hr14so2866070wib.1 for ; Sun, 08 Jul 2012 19:36:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:cc:content-type; bh=7DDUWBIZEhAdE40jE3unjq64sTZIdCYqnqy3bMyfWXg=; b=LjtCP/ApkKvE03wdY4ACXAWGKLNvxq7Rh5vTLlVu1yRjGOrk5aLVIIKPy9D3yQScQG Zcp8DSm1KOl2XiNRQ+ZIRP3EUl2AIBZReBTTBpQ/smUundk3M/vmcEirT49Sn6sCawfX hqMRxP2EeG2sds/1SWb+ec4him5H3uYMaIe+wlD4+m4Xr8PNHXxrq0/Be0CR2LdtcWFY ZTZoRhTG3fhuIYhIsH1PbUfVVEP0YEXlpfPpO2pdy2HBKKoZA6L38kJ2BWpU+dN+Dj2O mmoTG74Lrn6E06cIIipYTBtp5PjgaNJBPadSUtBKGHx0P1SANCqN4wPKPSeJlytu/PQ+ F8OA== MIME-Version: 1.0 Received: by 10.216.220.89 with SMTP id n67mr11049909wep.73.1341801393828; Sun, 08 Jul 2012 19:36:33 -0700 (PDT) Received: by 10.227.72.204 with HTTP; Sun, 8 Jul 2012 19:36:33 -0700 (PDT) Date: Sun, 8 Jul 2012 21:36:33 -0500 Message-ID: Subject: [PATCH] MacBook Pro Retina Keyboard Support From: Ryan Bourgeois To: jkosina@suse.cz Cc: linux-input@vger.kernel.org Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org 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. Signed-off-by: Ryan Bourgeois --- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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