From patchwork Fri Mar 11 18:45:23 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henrik Rydberg X-Patchwork-Id: 628681 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p2BIhdiq012446 for ; Fri, 11 Mar 2011 18:43:39 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753267Ab1CKSnW (ORCPT ); Fri, 11 Mar 2011 13:43:22 -0500 Received: from ch-smtp01.sth.basefarm.net ([80.76.149.212]:36703 "EHLO ch-smtp01.sth.basefarm.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753256Ab1CKSnV (ORCPT ); Fri, 11 Mar 2011 13:43:21 -0500 Received: from c83-254-52-20.bredband.comhem.se ([83.254.52.20]:44953 helo=polaris) by ch-smtp01.sth.basefarm.net with smtp (Exim 4.73) (envelope-from ) id 1Py7Id-0001RM-4L; Fri, 11 Mar 2011 19:42:58 +0100 Received: by polaris (sSMTP sendmail emulation); Fri, 11 Mar 2011 19:45:55 +0100 From: "Henrik Rydberg" To: Jiri Kosina Cc: Dmitry Torokhov , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, Andy Botting , stable@kernel.org, Henrik Rydberg Subject: [PATCH 2/2] Input: bcm5974 - add support for MacBookPro8 Date: Fri, 11 Mar 2011 19:45:23 +0100 Message-Id: <1299869123-18346-3-git-send-email-rydberg@euromail.se> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1299869123-18346-1-git-send-email-rydberg@euromail.se> References: <1299869123-18346-1-git-send-email-rydberg@euromail.se> X-Originating-IP: 83.254.52.20 X-Scan-Result: No virus found in message 1Py7Id-0001RM-4L. X-Scan-Signature: ch-smtp01.sth.basefarm.net 1Py7Id-0001RM-4L 4b8878b94fe81dea8b0fd28dae735511 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]); Fri, 11 Mar 2011 18:43:39 +0000 (UTC) diff --git a/drivers/input/mouse/bcm5974.c b/drivers/input/mouse/bcm5974.c index ee82851..3185314 100644 --- a/drivers/input/mouse/bcm5974.c +++ b/drivers/input/mouse/bcm5974.c @@ -63,6 +63,10 @@ #define USB_DEVICE_ID_APPLE_WELLSPRING4A_ANSI 0x0242 #define USB_DEVICE_ID_APPLE_WELLSPRING4A_ISO 0x0243 #define USB_DEVICE_ID_APPLE_WELLSPRING4A_JIS 0x0244 +/* Macbook8 (unibody, March 2011) */ +#define USB_DEVICE_ID_APPLE_WELLSPRING5_ANSI 0x0245 +#define USB_DEVICE_ID_APPLE_WELLSPRING5_ISO 0x0246 +#define USB_DEVICE_ID_APPLE_WELLSPRING5_JIS 0x0247 #define BCM5974_DEVICE(prod) { \ .match_flags = (USB_DEVICE_ID_MATCH_DEVICE | \ @@ -96,6 +100,10 @@ static const struct usb_device_id bcm5974_table[] = { BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING4A_ANSI), BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING4A_ISO), BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING4A_JIS), + /* MacbookPro8 */ + BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING5_ANSI), + BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING5_ISO), + BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING5_JIS), /* Terminating entry */ {} }; @@ -274,6 +282,18 @@ static const struct bcm5974_config bcm5974_config_table[] = { { DIM_X, DIM_X / SN_COORD, -4616, 5112 }, { DIM_Y, DIM_Y / SN_COORD, -142, 5234 } }, + { + USB_DEVICE_ID_APPLE_WELLSPRING5_ANSI, + USB_DEVICE_ID_APPLE_WELLSPRING5_ISO, + USB_DEVICE_ID_APPLE_WELLSPRING5_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, -4415, 5050 }, + { DIM_Y, DIM_Y / SN_COORD, -55, 6680 } + }, {} };