From patchwork Tue Aug 16 10:23:52 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Drake X-Patchwork-Id: 1070992 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p7GAO0lL007907 for ; Tue, 16 Aug 2011 10:24:01 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751885Ab1HPKYA (ORCPT ); Tue, 16 Aug 2011 06:24:00 -0400 Received: from ch1ehsobe005.messaging.microsoft.com ([216.32.181.185]:59715 "EHLO ch1outboundpool.messaging.microsoft.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751624Ab1HPKX7 (ORCPT ); Tue, 16 Aug 2011 06:23:59 -0400 Received: from mail170-ch1-R.bigfish.com (216.32.181.173) by CH1EHSOBE015.bigfish.com (10.43.70.65) with Microsoft SMTP Server id 14.1.225.22; Tue, 16 Aug 2011 10:23:58 +0000 Received: from mail170-ch1 (localhost.localdomain [127.0.0.1]) by mail170-ch1-R.bigfish.com (Postfix) with ESMTP id 4ACEF29823E; Tue, 16 Aug 2011 10:23:58 +0000 (UTC) X-SpamScore: 0 X-BigFish: PS0(zzzz1202hzz8275bh8275dhz2fh2a8h668h839h61h) 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 (mail170-ch1: 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 mail170-ch1 (localhost.localdomain [127.0.0.1]) by mail170-ch1 (MessageSwitch) id 1313490237996920_11636; Tue, 16 Aug 2011 10:23:57 +0000 (UTC) Received: from CH1EHSMHS022.bigfish.com (snatpool1.int.messaging.microsoft.com [10.43.68.245]) by mail170-ch1.bigfish.com (Postfix) with ESMTP id ECB081288055; Tue, 16 Aug 2011 10:23:57 +0000 (UTC) Received: from SN2PRD0402HT001.namprd04.prod.outlook.com (207.46.4.139) by CH1EHSMHS022.bigfish.com (10.43.70.22) with Microsoft SMTP Server (TLS) id 14.1.225.22; Tue, 16 Aug 2011 10:23:55 +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 10:23:54 +0000 Message-ID: <4E4A4538.4050608@adrake.org> Date: Tue, 16 Aug 2011 03:23:52 -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: , Dmitry Torokhov , Subject: [PATCH v2] Input: bcm5974: Add support for newer MacBookPro8,2 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 (demeter2.kernel.org [140.211.167.43]); Tue, 16 Aug 2011 10:24:01 +0000 (UTC) New MacBook Pro devices reporting product name MacBookPro8,2 come with newer/higher resolution touchpads than others with the same product name with USB ID 05ac:0252. This patch adds support for these devices. Signed-off-by: Andrew Drake Reviewed-by: Wanlong Gao --- 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 48d9ec1..da28018 100644 --- a/drivers/input/mouse/bcm5974.c +++ b/drivers/input/mouse/bcm5974.c @@ -71,6 +71,10 @@ #define USB_DEVICE_ID_APPLE_WELLSPRING6_ANSI 0x024c #define USB_DEVICE_ID_APPLE_WELLSPRING6_ISO 0x024d #define USB_DEVICE_ID_APPLE_WELLSPRING6_JIS 0x024e +/* 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 | \ @@ -112,6 +116,10 @@ static const struct usb_device_id bcm5974_table[] = { BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING6_ANSI), BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING6_ISO), BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING6_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 */ {} }; @@ -314,6 +322,18 @@ static const struct bcm5974_config bcm5974_config_table[] = { { DIM_X, DIM_X / SN_COORD, -4620, 5140 }, { DIM_Y, DIM_Y / SN_COORD, -150, 6600 } }, + { + 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 } + }, {} };