From patchwork Sat Aug 24 14:17:53 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Munsie X-Patchwork-Id: 2849210 Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E52C0BF546 for ; Sat, 24 Aug 2013 14:19:15 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 243D820276 for ; Sat, 24 Aug 2013 14:19:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 50E652026C for ; Sat, 24 Aug 2013 14:19:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754896Ab3HXOS4 (ORCPT ); Sat, 24 Aug 2013 10:18:56 -0400 Received: from mail-pa0-f44.google.com ([209.85.220.44]:37047 "EHLO mail-pa0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754624Ab3HXOSz (ORCPT ); Sat, 24 Aug 2013 10:18:55 -0400 Received: by mail-pa0-f44.google.com with SMTP id fz6so1750892pac.31 for ; Sat, 24 Aug 2013 07:18:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=nAEVrIQlPLeoxOgliT4bTp19xmoD29CieVv86jwJLVo=; b=s/F9DX0V3yGHnbTVU67kpNxpPlfvbmRvhKucLOu71sUwYemlQiBkBO5hWkXEw0nLah 52wg4J8kc2IDV4BQlRsTfPETwsoMx4wxLbBxqNZYIAvby69zT/xao+CoOwqe2QQ6Rf7D PxST9fbs81YE/lf6G9hoZR6KtVqMiiz6PIuxN/pvVn6G7QlzYSt+pL595FWf3BSgqMk5 /S5HlcpiPDsrwsjvca0Vn6lbgBKgUF9KS/kQaKbY6ZMc/b9OjDAJnN2oY9ZVzLMB4FOY 8we+dB4UBt1WCwJlB9hDTk4nXcYeyOFgOZI5q0Ti0w4VWiuKSa0fK2AqWebTneuPF/PZ Srqw== X-Received: by 10.67.14.67 with SMTP id fe3mr4584547pad.134.1377353934975; Sat, 24 Aug 2013 07:18:54 -0700 (PDT) Received: from localhost.localdomain (pa114-73-130-183.pa.nsw.optusnet.com.au. [114.73.130.183]) by mx.google.com with ESMTPSA id qv4sm6445019pbc.16.1969.12.31.16.00.00 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 24 Aug 2013 07:18:54 -0700 (PDT) From: Ian Munsie To: Henrik Rydberg , Dmitry Torokhov , Jiri Kosina Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, Ian Munsie Subject: [PATCH 2/2] Input: bcm5974: Add another device ID for the mid-2013 Macbook Air Date: Sun, 25 Aug 2013 00:17:53 +1000 Message-Id: <1377353873-17000-3-git-send-email-darkstarsword@gmail.com> X-Mailer: git-send-email 1.8.4.rc3 In-Reply-To: <1377353873-17000-1-git-send-email-darkstarsword@gmail.com> References: <1377353873-17000-1-git-send-email-darkstarsword@gmail.com> Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch adds a device ID found for mid-2013 Macbook Air 6,1 from lsusb: Bus 001 Device 003: ID 05ac:0290 Apple, Inc. Since IDs already exist for this generation Macbook air as WELLSPRING8, name this one WELLSPRING8A. This only adds an ANSI version since it's device ID is only one less than the existing WELLSPRING8 IDs. Signed-off-by: Ian Munsie --- drivers/input/mouse/bcm5974.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/drivers/input/mouse/bcm5974.c b/drivers/input/mouse/bcm5974.c index 4ef4d5e..fcd2f3f 100644 --- a/drivers/input/mouse/bcm5974.c +++ b/drivers/input/mouse/bcm5974.c @@ -88,6 +88,8 @@ #define USB_DEVICE_ID_APPLE_WELLSPRING7A_ANSI 0x0259 #define USB_DEVICE_ID_APPLE_WELLSPRING7A_ISO 0x025a #define USB_DEVICE_ID_APPLE_WELLSPRING7A_JIS 0x025b +/* MacbookAir6,1 (unibody, June 2013) */ +#define USB_DEVICE_ID_APPLE_WELLSPRING8A_ANSI 0x0290 /* MacbookAir6,2 (unibody, June 2013) */ #define USB_DEVICE_ID_APPLE_WELLSPRING8_ANSI 0x0291 #define USB_DEVICE_ID_APPLE_WELLSPRING8_ISO 0x0292 @@ -149,6 +151,8 @@ static const struct usb_device_id bcm5974_table[] = { BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING7A_ANSI), BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING7A_ISO), BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING7A_JIS), + /* MacbookAir6,1 */ + BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING8A_ANSI), /* MacbookAir6,2 */ BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING8_ANSI), BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING8_ISO), @@ -424,6 +428,19 @@ static const struct bcm5974_config bcm5974_config_table[] = { { SN_COORD, -150, 6600 }, { SN_ORIENT, -MAX_FINGER_ORIENTATION, MAX_FINGER_ORIENTATION } }, + { + USB_DEVICE_ID_APPLE_WELLSPRING8A_ANSI, + 0, + 0, + HAS_INTEGRATED_BUTTON, + 0, sizeof(struct bt_data), + 0x83, TYPE3, FINGER_TYPE3, FINGER_TYPE3 + SIZEOF_ALL_FINGERS, + { SN_PRESSURE, 0, 300 }, + { SN_WIDTH, 0, 2048 }, + { SN_COORD, -4620, 5140 }, + { SN_COORD, -150, 6600 }, + { SN_ORIENT, -MAX_FINGER_ORIENTATION, MAX_FINGER_ORIENTATION } + }, {} };