From: Enric Balletbo i Serra <enric.balletbo@collabora.com>
To: lee.jones@linaro.org
Cc: groeck@chromium.org, andy.shevchenko@gmail.com,
kernel@collabora.com, gwendal@chromium.org,
linux-kernel@vger.kernel.org, Wei-Ning Huang <wnhuang@google.com>
Subject: [PATCH v3 7/8] mfd: cros_ec_i2c: add ACPI module device table
Date: Mon, 26 Feb 2018 11:26:05 +0100 [thread overview]
Message-ID: <20180226102606.15093-8-enric.balletbo@collabora.com> (raw)
In-Reply-To: <20180226102606.15093-1-enric.balletbo@collabora.com>
From: Wei-Ning Huang <wnhuang@google.com>
Add ACPI module device table for matching cros-ec devices to load the
cros_ec_i2c driver automatically.
Signed-off-by: Wei-Ning Huang <wnhuang@google.com>
Acked-by: Benson Leung <bleung@chromium.org>
Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
Reviewed-by: Gwendal Grignou <gwendal@chromium.org>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
---
Changes in v3:
- [7/8] Add the Reviewed-by Andy Shevchenko.
- [7/8] Avoid commas in terminator entries.
Changes in v2:
- [7/8] Add the Reviewed-by Gwendal.
drivers/mfd/cros_ec_i2c.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/drivers/mfd/cros_ec_i2c.c b/drivers/mfd/cros_ec_i2c.c
index 9f70de1e4c70..02a7bacdc056 100644
--- a/drivers/mfd/cros_ec_i2c.c
+++ b/drivers/mfd/cros_ec_i2c.c
@@ -13,6 +13,7 @@
* GNU General Public License for more details.
*/
+#include <linux/acpi.h>
#include <linux/delay.h>
#include <linux/kernel.h>
#include <linux/module.h>
@@ -344,11 +345,13 @@ static int cros_ec_i2c_resume(struct device *dev)
static SIMPLE_DEV_PM_OPS(cros_ec_i2c_pm_ops, cros_ec_i2c_suspend,
cros_ec_i2c_resume);
+#ifdef CONFIG_OF
static const struct of_device_id cros_ec_i2c_of_match[] = {
{ .compatible = "google,cros-ec-i2c", },
{ /* sentinel */ },
};
MODULE_DEVICE_TABLE(of, cros_ec_i2c_of_match);
+#endif
static const struct i2c_device_id cros_ec_i2c_id[] = {
{ "cros-ec-i2c", 0 },
@@ -356,9 +359,18 @@ static const struct i2c_device_id cros_ec_i2c_id[] = {
};
MODULE_DEVICE_TABLE(i2c, cros_ec_i2c_id);
+#ifdef CONFIG_ACPI
+static const struct acpi_device_id cros_ec_i2c_acpi_id[] = {
+ { "GOOG0008", 0 },
+ { /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(acpi, cros_ec_i2c_acpi_id);
+#endif
+
static struct i2c_driver cros_ec_driver = {
.driver = {
.name = "cros-ec-i2c",
+ .acpi_match_table = ACPI_PTR(cros_ec_i2c_acpi_id),
.of_match_table = of_match_ptr(cros_ec_i2c_of_match),
.pm = &cros_ec_i2c_pm_ops,
},
--
2.16.1
next prev parent reply other threads:[~2018-02-26 10:26 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-26 10:25 [PATCH v3 0/8] mfd: cros_ec: add subdevices and fixes Enric Balletbo i Serra
2018-02-26 10:25 ` [PATCH v3 1/8] mfd: cros_ec: fail early if we cannot identify the EC Enric Balletbo i Serra
2018-03-07 15:52 ` Lee Jones
2018-02-26 10:26 ` [PATCH v3 2/8] mfd: cros_ec: free IRQ automatically Enric Balletbo i Serra
2018-03-07 15:52 ` Lee Jones
2018-02-26 10:26 ` [PATCH v3 3/8] mfd: cros_ec: Don't try to grab log when suspended Enric Balletbo i Serra
2018-02-27 6:47 ` Benson Leung
2018-03-07 15:53 ` Lee Jones
2018-03-07 15:53 ` Lee Jones
2018-02-26 10:26 ` [PATCH v3 4/8] mfd: cros_ec_dev: Register cros-ec-rtc driver as a subdevice Enric Balletbo i Serra
2018-03-07 15:51 ` Lee Jones
2018-02-26 10:26 ` [PATCH v3 5/8] mfd: cros_ec_dev: Register cros_ec_accel_legacy " Enric Balletbo i Serra
2018-03-07 16:04 ` Lee Jones
2018-03-20 11:37 ` Enric Balletbo Serra
2018-02-26 10:26 ` [PATCH v3 6/8] mfd: cros_ec_dev: register shutdown function for debugfs Enric Balletbo i Serra
2018-03-07 16:05 ` Lee Jones
2018-02-26 10:26 ` Enric Balletbo i Serra [this message]
2018-02-26 11:38 ` [PATCH v3 7/8] mfd: cros_ec_i2c: add ACPI module device table Andy Shevchenko
2018-03-07 16:06 ` Lee Jones
2018-02-26 10:26 ` [PATCH v3 8/8] mfd: cros_ec_i2c: moving the system sleep pm ops to late Enric Balletbo i Serra
2018-03-07 16:06 ` Lee Jones
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=20180226102606.15093-8-enric.balletbo@collabora.com \
--to=enric.balletbo@collabora.com \
--cc=andy.shevchenko@gmail.com \
--cc=groeck@chromium.org \
--cc=gwendal@chromium.org \
--cc=kernel@collabora.com \
--cc=lee.jones@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=wnhuang@google.com \
/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).