From patchwork Tue Dec 9 09:11:44 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dudley Du X-Patchwork-Id: 5461211 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 D54F7BEEA8 for ; Tue, 9 Dec 2014 09:17:06 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0C0CA20131 for ; Tue, 9 Dec 2014 09:17:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 322AB200CA for ; Tue, 9 Dec 2014 09:17:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756226AbaLIJQp (ORCPT ); Tue, 9 Dec 2014 04:16:45 -0500 Received: from mail-pa0-f41.google.com ([209.85.220.41]:51009 "EHLO mail-pa0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932343AbaLIJOw (ORCPT ); Tue, 9 Dec 2014 04:14:52 -0500 Received: by mail-pa0-f41.google.com with SMTP id rd3so196983pab.14 for ; Tue, 09 Dec 2014 01:14:52 -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=ZTR29axyYSlRL2jmps9HqJ/V5QzirsfyPiG18FLPiKM=; b=Va3tkfbGPsvMUcLQbT88d8ImwhoiU2Yu4ldTcJv6atYN9zGZUZuqT+ozMKF3hpD6Xe 7BDkLzk/6tQmUYtg6i/12SFgBhiNxzP87QVVHQM0wHZmI8cOlDMY56bH7UPVRiMDFmgt jaYff8VMK587Zn92jkfMRcOphwbtBCylGx32AfcslClyZht2UTypgX2dKQjWLOTOzOe9 8XTWbmt1W/u/s9ElHJ32EQ374OzCG+mvzJ1evMXemSf8gDOjhYpR8MU/7FshCPiT2EF7 TN9e20SuI6p45VpxFC0pSuQ27YE0Ap2M0Q52JPT8A72D9j7v3KEq1wjuGxHk1voLEXAa UUGQ== X-Received: by 10.68.218.7 with SMTP id pc7mr3545828pbc.80.1418116491958; Tue, 09 Dec 2014 01:14:51 -0800 (PST) Received: from localhost ([140.207.206.26]) by mx.google.com with ESMTPSA id gz10sm898981pac.23.2014.12.09.01.14.48 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 09 Dec 2014 01:14:50 -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 v13 12/12] input: cyapa: add acpi device id supported Date: Tue, 9 Dec 2014 17:11:44 +0800 Message-Id: <1418116304-11392-13-git-send-email-dudley.dulixin@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1418116304-11392-1-git-send-email-dudley.dulixin@gmail.com> References: <1418116304-11392-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 ff8cd9b..c992bd6 100644 --- a/drivers/input/mouse/cyapa.c +++ b/drivers/input/mouse/cyapa.c @@ -24,6 +24,7 @@ #include #include #include +#include #include "cyapa.h" @@ -1322,11 +1323,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,