From patchwork Tue Aug 16 08:05:32 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Drake X-Patchwork-Id: 1070782 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p7G85pQT032143 for ; Tue, 16 Aug 2011 08:05:51 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751198Ab1HPIFu (ORCPT ); Tue, 16 Aug 2011 04:05:50 -0400 Received: from tx2ehsobe003.messaging.microsoft.com ([65.55.88.13]:48861 "EHLO TX2EHSOBE005.bigfish.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751020Ab1HPIFs (ORCPT ); Tue, 16 Aug 2011 04:05:48 -0400 Received: from mail27-tx2-R.bigfish.com (10.9.14.240) by TX2EHSOBE005.bigfish.com (10.9.40.25) with Microsoft SMTP Server id 14.1.225.22; Tue, 16 Aug 2011 08:05:45 +0000 Received: from mail27-tx2 (localhost.localdomain [127.0.0.1]) by mail27-tx2-R.bigfish.com (Postfix) with ESMTP id 96369D8824A; Tue, 16 Aug 2011 08:05:47 +0000 (UTC) X-SpamScore: -15 X-BigFish: PS-15(zzbb2dK9371K1432N98dKzz1202hzz8275dhz2fh2a8h668h839h93fh61h) X-Spam-TCS-SCL: 0:0 X-Forefront-Antispam-Report: CIP:207.46.4.139; KIP:(null); UIP:(null); IPVD:NLI; H:SN2PRD0402HT001.namprd04.prod.outlook.com; RD:none; EFVD:NLI Received-SPF: pass (mail27-tx2: domain of adrake.org designates 207.46.4.139 as permitted sender) client-ip=207.46.4.139; envelope-from=adrake@adrake.org; helo=SN2PRD0402HT001.namprd04.prod.outlook.com ; .outlook.com ; Received: from mail27-tx2 (localhost.localdomain [127.0.0.1]) by mail27-tx2 (MessageSwitch) id 1313481947204939_32675; Tue, 16 Aug 2011 08:05:47 +0000 (UTC) Received: from TX2EHSMHS043.bigfish.com (unknown [10.9.14.243]) by mail27-tx2.bigfish.com (Postfix) with ESMTP id 2A2D194804F; Tue, 16 Aug 2011 08:05:47 +0000 (UTC) Received: from SN2PRD0402HT001.namprd04.prod.outlook.com (207.46.4.139) by TX2EHSMHS043.bigfish.com (10.9.99.143) with Microsoft SMTP Server (TLS) id 14.1.225.22; Tue, 16 Aug 2011 08:05:46 +0000 Received: from [172.16.5.64] (63.235.13.3) by pod51009.outlook.com (10.27.50.79) with Microsoft SMTP Server (TLS) id 14.1.225.64; Tue, 16 Aug 2011 08:05:45 +0000 Message-ID: <4E4A24CC.6000909@adrake.org> Date: Tue, 16 Aug 2011 01:05:32 -0700 From: Andrew Drake User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:5.0) Gecko/20110707 Thunderbird/5.0 MIME-Version: 1.0 To: CC: , Subject: Re: [PATCH] input: bcm5974: Add support for newer MacBookPro8,2 References: <4E4A0C26.1060307@adrake.org> <4E4A1894.4070802@cn.fujitsu.com> In-Reply-To: <4E4A1894.4070802@cn.fujitsu.com> X-Originating-IP: [63.235.13.3] X-OriginatorOrg: adrake.org Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Tue, 16 Aug 2011 08:05:55 +0000 (UTC) On 08/16/2011 12:13 AM, Wanlong Gao wrote: > On 08/16/2011 02:20 PM, Andrew Drake wrote: >> I just received a new MacBook Pro, product name MacBookPro8,2. It came >> with a newer/higher resolution touchpad than others with the same >> product name with USB ID 05ac:0252. The following patch (which applies >> on top of 3.1-rc2) adds support for this device. >> >> > I wonder that why can't I apply this patch? > #git am <[path]> > Applying: input: bcm5974: Add support for newer MacBookPro8,2 > fatal: corrupt patch at line 32 > Patch failed at 0001 input: bcm5974: Add support for newer MacBookPro8,2 > Sorry, my mailer wrapped some of the lines. Try this: Signed-off-by: Andrew Drake --- drivers/input/mouse/bcm5974.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/drivers/input/mouse/bcm5974.c b/drivers/input/mouse/bcm5974.c index 3126983..a0a4964 100644 --- a/drivers/input/mouse/bcm5974.c +++ b/drivers/input/mouse/bcm5974.c @@ -67,6 +67,10 @@ #define USB_DEVICE_ID_APPLE_WELLSPRING5_ANSI 0x0245 #define USB_DEVICE_ID_APPLE_WELLSPRING5_ISO 0x0246 #define USB_DEVICE_ID_APPLE_WELLSPRING5_JIS 0x0247 +/* Macbook8,2 (unibody) */ +#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 BCM5974_DEVICE(prod) { \ .match_flags = (USB_DEVICE_ID_MATCH_DEVICE | \ @@ -104,6 +108,10 @@ static const struct usb_device_id bcm5974_table[] = { BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING5_ANSI), BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING5_ISO), BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING5_JIS), + /* MacbookPro8,2 */ + BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING5A_ANSI), + BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING5A_ISO), + BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING5A_JIS), /* Terminating entry */ {} }; @@ -294,6 +302,18 @@ static const struct bcm5974_config bcm5974_config_table[] = { { DIM_X, DIM_X / SN_COORD, -4415, 5050 }, { DIM_Y, DIM_Y / SN_COORD, -55, 6680 } }, + { + USB_DEVICE_ID_APPLE_WELLSPRING5A_ANSI, + USB_DEVICE_ID_APPLE_WELLSPRING5A_ISO, + USB_DEVICE_ID_APPLE_WELLSPRING5A_JIS, + HAS_INTEGRATED_BUTTON, + 0x84, sizeof(struct bt_data), + 0x81, TYPE2, FINGER_TYPE2, FINGER_TYPE2 + SIZEOF_ALL_FINGERS, + { DIM_PRESSURE, DIM_PRESSURE / SN_PRESSURE, 0, 300 }, + { DIM_WIDTH, DIM_WIDTH / SN_WIDTH, 0, 2048 }, + { DIM_X, DIM_X / SN_COORD, -4750, 5280 }, + { DIM_Y, DIM_Y / SN_COORD, -150, 6730 } + }, {} };