From patchwork Wed Dec 17 09:58:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dudley Du X-Patchwork-Id: 5506071 Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id C257A9F1D4 for ; Wed, 17 Dec 2014 10:01:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CEE6B209DC for ; Wed, 17 Dec 2014 10:01:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2497E209CF for ; Wed, 17 Dec 2014 10:01:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752026AbaLQKBL (ORCPT ); Wed, 17 Dec 2014 05:01:11 -0500 Received: from bay004-omc1s24.hotmail.com ([65.54.190.35]:58830 "EHLO BAY004-OMC1S24.hotmail.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751986AbaLQKBG (ORCPT ); Wed, 17 Dec 2014 05:01:06 -0500 Received: from BAY407-EAS367 ([65.54.190.59]) by BAY004-OMC1S24.hotmail.com over TLS secured channel with Microsoft SMTPSVC(7.5.7601.22751); Wed, 17 Dec 2014 01:58:06 -0800 X-TMN: [eRoAQlLnDzFHi4YVwmbSKSYvvNcA3l8g] X-Originating-Email: [dudlx@outlook.com] Message-ID: From: Dudley Du To: , , CC: , , Subject: [PATCH v16 12/12] input: cyapa: add acpi device id support Date: Wed, 17 Dec 2014 17:58:04 +0800 MIME-Version: 1.0 X-Mailer: Microsoft Outlook 15.0 Thread-Index: AdAZ34AwMsEeAifSTziogTS9Y+++Jg== Content-Language: zh-cn X-OriginalArrivalTime: 17 Dec 2014 09:58:06.0172 (UTC) FILETIME=[F45A89C0:01D019DF] 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.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_HI,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 support. 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 406f38b..62ef19a 100644 --- a/drivers/input/mouse/cyapa.c +++ b/drivers/input/mouse/cyapa.c @@ -24,6 +24,7 @@ #include #include #include +#include #include "cyapa.h" @@ -1315,11 +1316,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,