From: Dudley Du <dudl@cypress.com>
To: dmitry.torokhov@gmail.com, jmmahler@gmail.com, rydberg@euromail.se
Cc: Dudley Du <dudl@cypress.com>,
bleung@google.com, linux-input@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH v16 12/12] input: cyapa: add acpi device id support
Date: Thu, 18 Dec 2014 18:00:56 +0800 [thread overview]
Message-ID: <1418896856-15766-13-git-send-email-dudl@cypress.com> (raw)
In-Reply-To: <1418896856-15766-1-git-send-email-dudl@cypress.com>
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 <dudl@cypress.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 406f38b..62ef19a 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"
@@ -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,
--
1.9.1
next prev parent reply other threads:[~2014-12-18 10:56 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-18 10:00 [PATCH v16 00/12] input: cyapa: instruction of cyapa patches Dudley Du
2014-12-18 10:00 ` [PATCH v16 01/12] input: cyapa: re-design driver to support multi-trackpad in one driver Dudley Du
2014-12-30 1:06 ` Dmitry Torokhov
2014-12-30 4:43 ` Dudley Du
2014-12-18 10:00 ` [PATCH v16 02/12] input: cyapa: add gen5 trackpad device basic functions support Dudley Du
2014-12-18 10:00 ` [PATCH v16 03/12] input: cyapa: add power management interfaces support for the device Dudley Du
2014-12-30 0:51 ` Dmitry Torokhov
2014-12-18 10:00 ` [PATCH v16 04/12] input: cyapa: add runtime " Dudley Du
2014-12-30 0:57 ` Dmitry Torokhov
2014-12-18 10:00 ` [PATCH v16 05/12] input: cyapa: add sysfs interfaces support in the cyapa driver Dudley Du
2014-12-18 10:00 ` [PATCH v16 06/12] input: cyapa: add gen3 trackpad device firmware update function support Dudley Du
2014-12-18 10:00 ` [PATCH v16 07/12] input: cyapa: add gen3 trackpad device read baseline " Dudley Du
2014-12-18 10:00 ` [PATCH v16 08/12] input: cyapa: add gen3 trackpad device force re-calibrate " Dudley Du
2014-12-18 10:00 ` [PATCH v16 09/12] input: cyapa: add gen5 trackpad device firmware update " Dudley Du
2014-12-18 10:00 ` [PATCH v16 10/12] input: cyapa: add gen5 trackpad device read baseline " Dudley Du
2014-12-18 10:00 ` [PATCH v16 11/12] input: cyapa: add gen5 trackpad device force re-calibrate " Dudley Du
2014-12-18 10:00 ` Dudley Du [this message]
2014-12-18 11:06 ` [PATCH v16 00/12] input: cyapa: instruction of cyapa patches Dudley Du
2014-12-18 20:17 ` Benson Leung
2014-12-18 22:14 ` Jeremiah Mahler
2014-12-19 1:45 ` Dudley Du
2014-12-20 7:15 ` Jeremiah Mahler
2014-12-20 7:31 ` Dmitry Torokhov
2014-12-22 2:09 ` Dudley Du
2014-12-22 2:39 ` Dmitry Torokhov
2014-12-22 2:56 ` Dudley Du
-- strict thread matches above, loose matches on Subject: below --
2014-12-17 9:58 [PATCH v16 12/12] input: cyapa: add acpi device id support 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=1418896856-15766-13-git-send-email-dudl@cypress.com \
--to=dudl@cypress.com \
--cc=bleung@google.com \
--cc=dmitry.torokhov@gmail.com \
--cc=jmmahler@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).