Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1709068 > unrolled thread
| Started by | Thierry Escande <thierry.escande@collabora.com> |
|---|---|
| First post | 2017-08-11 00:20 +0200 |
| Last post | 2017-08-11 06:20 +0200 |
| Articles | 2 — 2 participants |
Back to article view | Back to linux.kernel
This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by
below is the oldest one visible, not the original post.
[PATCH 6/8] mfd: cros_ec_i2c: add ACPI module device table Thierry Escande <thierry.escande@collabora.com> - 2017-08-11 00:20 +0200
Re: [PATCH 6/8] mfd: cros_ec_i2c: add ACPI module device table Benson Leung <bleung@google.com> - 2017-08-11 06:20 +0200
| From | Thierry Escande <thierry.escande@collabora.com> |
|---|---|
| Date | 2017-08-11 00:20 +0200 |
| Subject | [PATCH 6/8] mfd: cros_ec_i2c: add ACPI module device table |
| Message-ID | <ud3Y5-3tF-13@gated-at.bofh.it> |
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>
Signed-off-by: Thierry Escande <thierry.escande@collabora.com>
---
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 576fcc4..56fc667 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>
@@ -345,11 +346,13 @@ const struct dev_pm_ops cros_ec_i2c_pm_ops = {
SET_LATE_SYSTEM_SLEEP_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 },
@@ -357,9 +360,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 },
+ { },
+};
+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.7.4
[toc] | [next] | [standalone]
| From | Benson Leung <bleung@google.com> |
|---|---|
| Date | 2017-08-11 06:20 +0200 |
| Message-ID | <ud9At-782-7@gated-at.bofh.it> |
| In reply to | #1709068 |
[Multipart message — attachments visible in raw view] — view raw
Hi Thierry,
On Fri, Aug 11, 2017 at 12:16:48AM +0200, Thierry Escande wrote:
> 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>
> Signed-off-by: Thierry Escande <thierry.escande@collabora.com>
Acked-by: Benson Leung <bleung@chromium.org>
> ---
> 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 576fcc4..56fc667 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>
> @@ -345,11 +346,13 @@ const struct dev_pm_ops cros_ec_i2c_pm_ops = {
> SET_LATE_SYSTEM_SLEEP_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 },
> @@ -357,9 +360,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 },
> + { },
> +};
> +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.7.4
>
--
Benson Leung
Staff Software Engineer
Chrome OS Kernel
Google Inc.
bleung@google.com
Chromium OS Project
bleung@chromium.org
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web