From: Dudley Du <dudley.dulixin@gmail.com>
To: dmitry.torokhov@gmail.com, rydberg@euromail.se
Cc: Dudley Du <dudley.dulixin@gmail.com>,
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 [thread overview]
Message-ID: <1418116304-11392-13-git-send-email-dudley.dulixin@gmail.com> (raw)
In-Reply-To: <1418116304-11392-1-git-send-email-dudley.dulixin@gmail.com>
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 <dudley.dulixin@gmail.com>
---
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 <linux/slab.h>
#include <linux/uaccess.h>
#include <linux/pm_runtime.h>
+#include <linux/acpi.h>
#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,
--
1.9.1
next prev parent reply other threads:[~2014-12-09 9:11 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-09 9:11 [PATCH v13 00/12] input: cyapa: instruction of cyapa patches Dudley Du
2014-12-09 9:11 ` [PATCH v13 01/12] input: cyapa: re-design driver to support multi-trackpad in one driver Dudley Du
2014-12-09 9:11 ` [PATCH v13 02/12] input: cyapa: add gen5 trackpad device basic functions support Dudley Du
2014-12-09 9:11 ` [PATCH v13 03/12] input: cyapa: add power management interfaces supported for the device Dudley Du
2014-12-09 9:11 ` [PATCH v13 04/12] input: cyapa: add runtime " Dudley Du
2014-12-09 9:11 ` [PATCH v13 05/12] input: cyapa: add sysfs interfaces supported in the cyapa driver Dudley Du
2014-12-09 9:11 ` [PATCH v13 06/12] input: cyapa: add gen3 trackpad device firmware update function support Dudley Du
2014-12-09 9:11 ` [PATCH v13 07/12] input: cyapa: add gen3 trackpad device read baseline " Dudley Du
2014-12-09 9:11 ` [PATCH v13 08/12] input: cyapa: add gen3 trackpad device force re-calibrate " Dudley Du
2014-12-09 9:11 ` [PATCH v13 09/12] input: cyapa: add gen5 trackpad device firmware update " Dudley Du
2014-12-10 3:33 ` Jeremiah Mahler
2014-12-10 8:54 ` Jeremiah Mahler
2014-12-10 9:19 ` Dudley Du
2014-12-10 11:06 ` Jeremiah Mahler
2014-12-09 9:11 ` [PATCH v13 10/12] input: cyapa: add gen5 trackpad device read baseline " Dudley Du
2014-12-10 4:02 ` Jeremiah Mahler
2014-12-09 9:11 ` [PATCH v13 11/12] input: cyapa: add gen5 trackpad device force re-calibrate " Dudley Du
2014-12-10 4:05 ` Jeremiah Mahler
2014-12-09 9:11 ` Dudley Du [this message]
2014-12-10 4:10 ` [PATCH v13 00/12] input: cyapa: instruction of cyapa patches Jeremiah Mahler
2014-12-10 5:10 ` Dudley Du
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1418116304-11392-13-git-send-email-dudley.dulixin@gmail.com \
--to=dudley.dulixin@gmail.com \
--cc=bleung@google.com \
--cc=dmitry.torokhov@gmail.com \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rydberg@euromail.se \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).