From patchwork Wed Nov 19 08:37:51 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dudley Du X-Patchwork-Id: 5335371 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 83DEBC11AC for ; Wed, 19 Nov 2014 08:42:43 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AEF02200FE for ; Wed, 19 Nov 2014 08:42:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CB436200F0 for ; Wed, 19 Nov 2014 08:42:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754442AbaKSImX (ORCPT ); Wed, 19 Nov 2014 03:42:23 -0500 Received: from mail-pd0-f169.google.com ([209.85.192.169]:34488 "EHLO mail-pd0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755185AbaKSImU (ORCPT ); Wed, 19 Nov 2014 03:42:20 -0500 Received: by mail-pd0-f169.google.com with SMTP id fp1so140129pdb.14 for ; Wed, 19 Nov 2014 00:42:19 -0800 (PST) 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=UDUvr4MhU142Io+ryujiJEiwDahIvzfxHJ6J0lRDJ2g=; b=GTvjxHINaqPajwsXRCaoXjD+hZD+k334jRIxjjsS1BUdhbCHrmKo56m4VynZDJvSvV ZUrze2Cf5GHh6pdkGgmSlKGmltyPsS34LbmKbNynVkPrFlQ2mxNA3WCW1HUx45l8pE9I gs2BGz4wWQKByMFJY+yDzIIsVUPyLqg37VxRCGw6fJaumjxAu47US2zn+vR5fDweeWNw teMcpqtC8ZtIZ5JyPR46GvbuF+5WbRY/WIHnf49zgYBAbol0H7KitejyLo8GEhwP7jVv ozSO13tg3ztd8zy6v1Ghs34k5Hi2FQk6WZHGsUwqhaKSPRsz/ejkpTj4jhqT5zB01cTJ ngRw== X-Received: by 10.70.126.134 with SMTP id my6mr44401695pdb.14.1416386539673; Wed, 19 Nov 2014 00:42:19 -0800 (PST) Received: from localhost ([140.207.206.26]) by mx.google.com with ESMTPSA id ki6sm1075241pdb.85.2014.11.19.00.42.16 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 19 Nov 2014 00:42:18 -0800 (PST) From: Dudley Du To: dmitry.torokhov@gmail.com, rydberg@euromail.se Cc: Dudley Du , bleung@google.com, linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v11 19/19] input: cyapa: add acpi device id supported Date: Wed, 19 Nov 2014 16:37:51 +0800 Message-Id: <1416386271-28167-20-git-send-email-dudley.dulixin@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1416386271-28167-1-git-send-email-dudley.dulixin@gmail.com> References: <1416386271-28167-1-git-send-email-dudley.dulixin@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=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 Add acpi device tree supported. acpi device id "CYAP0000" is for old gen3 trackpad devices. acpi device id "CYAP0001" is for new gen5 trackpad devices. TEST=test on Chromebooks. Signed-off-by: Dudley Du --- drivers/input/mouse/cyapa.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/drivers/input/mouse/cyapa.c b/drivers/input/mouse/cyapa.c index ca31119..eb53aa0 100644 --- a/drivers/input/mouse/cyapa.c +++ b/drivers/input/mouse/cyapa.c @@ -25,6 +25,7 @@ #include #include #include +#include #include "cyapa.h" @@ -1501,11 +1502,23 @@ static const struct i2c_device_id cyapa_id_table[] = { }; MODULE_DEVICE_TABLE(i2c, cyapa_id_table); +#ifdef CONFIG_ACPI +static const struct acpi_device_id cyapa_acpi_id[] = { + { "CYAP0000", 0 }, /* Gen3 trackpad with 0x67 I2C address. */ + { "CYAP0001", 0 }, /* Gen5 trackpad with 0x24 I2C address. */ + { } +}; +MODULE_DEVICE_TABLE(acpi, cyapa_acpi_id); +#endif + static struct i2c_driver cyapa_driver = { .driver = { .name = "cyapa", .owner = THIS_MODULE, .pm = &cyapa_pm_ops, +#ifdef CONFIG_ACPI + .acpi_match_table = ACPI_PTR(cyapa_acpi_id), +#endif }, .probe = cyapa_probe,