* [PATCH v2 2/2] HID: google: Add of_match table to Whiskers switch device.
@ 2019-10-21 3:02 Ikjoon Jang
2019-10-23 0:30 ` Dmitry Torokhov
0 siblings, 1 reply; 2+ messages in thread
From: Ikjoon Jang @ 2019-10-21 3:02 UTC (permalink / raw)
To: linux-input, devicetree
Cc: Dmitry Torokhov, Rob Herring, Mark Rutland, Jiri Kosina,
Benjamin Tissoires, linux-kernel, Nicolas Boitchat, Ikjoon Jang
Add a device tree match table.
Signed-off-by: Ikjoon Jang <ikjn@chromium.org>
---
drivers/hid/hid-google-hammer.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/drivers/hid/hid-google-hammer.c b/drivers/hid/hid-google-hammer.c
index 84f8c127ebdc..b726f8a15044 100644
--- a/drivers/hid/hid-google-hammer.c
+++ b/drivers/hid/hid-google-hammer.c
@@ -17,6 +17,7 @@
#include <linux/hid.h>
#include <linux/leds.h>
#include <linux/module.h>
+#include <linux/of.h>
#include <linux/platform_data/cros_ec_commands.h>
#include <linux/platform_data/cros_ec_proto.h>
#include <linux/platform_device.h>
@@ -264,12 +265,21 @@ static const struct acpi_device_id cbas_ec_acpi_ids[] = {
};
MODULE_DEVICE_TABLE(acpi, cbas_ec_acpi_ids);
+#ifdef CONFIG_OF
+static const struct of_device_id cbas_ec_of_match[] = {
+ { .compatible = "google,cros-cbas" },
+ { },
+};
+MODULE_DEVICE_TABLE(of, cbas_ec_of_match);
+#endif
+
static struct platform_driver cbas_ec_driver = {
.probe = cbas_ec_probe,
.remove = cbas_ec_remove,
.driver = {
.name = "cbas_ec",
.acpi_match_table = ACPI_PTR(cbas_ec_acpi_ids),
+ .of_match_table = of_match_ptr(cbas_ec_of_match),
.pm = &cbas_ec_pm_ops,
},
};
--
2.23.0.866.gb869b98d4c-goog
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2 2/2] HID: google: Add of_match table to Whiskers switch device.
2019-10-21 3:02 [PATCH v2 2/2] HID: google: Add of_match table to Whiskers switch device Ikjoon Jang
@ 2019-10-23 0:30 ` Dmitry Torokhov
0 siblings, 0 replies; 2+ messages in thread
From: Dmitry Torokhov @ 2019-10-23 0:30 UTC (permalink / raw)
To: Ikjoon Jang
Cc: linux-input, devicetree, Rob Herring, Mark Rutland, Jiri Kosina,
Benjamin Tissoires, linux-kernel, Nicolas Boitchat
On Mon, Oct 21, 2019 at 11:02:33AM +0800, Ikjoon Jang wrote:
> Add a device tree match table.
>
> Signed-off-by: Ikjoon Jang <ikjn@chromium.org>
Reviewed-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> ---
> drivers/hid/hid-google-hammer.c | 10 ++++++++++
> 1 file changed, 10 insertions(+)
>
> diff --git a/drivers/hid/hid-google-hammer.c b/drivers/hid/hid-google-hammer.c
> index 84f8c127ebdc..b726f8a15044 100644
> --- a/drivers/hid/hid-google-hammer.c
> +++ b/drivers/hid/hid-google-hammer.c
> @@ -17,6 +17,7 @@
> #include <linux/hid.h>
> #include <linux/leds.h>
> #include <linux/module.h>
> +#include <linux/of.h>
> #include <linux/platform_data/cros_ec_commands.h>
> #include <linux/platform_data/cros_ec_proto.h>
> #include <linux/platform_device.h>
> @@ -264,12 +265,21 @@ static const struct acpi_device_id cbas_ec_acpi_ids[] = {
> };
> MODULE_DEVICE_TABLE(acpi, cbas_ec_acpi_ids);
>
> +#ifdef CONFIG_OF
> +static const struct of_device_id cbas_ec_of_match[] = {
> + { .compatible = "google,cros-cbas" },
> + { },
> +};
> +MODULE_DEVICE_TABLE(of, cbas_ec_of_match);
> +#endif
> +
> static struct platform_driver cbas_ec_driver = {
> .probe = cbas_ec_probe,
> .remove = cbas_ec_remove,
> .driver = {
> .name = "cbas_ec",
> .acpi_match_table = ACPI_PTR(cbas_ec_acpi_ids),
> + .of_match_table = of_match_ptr(cbas_ec_of_match),
> .pm = &cbas_ec_pm_ops,
> },
> };
--
Dmitry
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-10-23 0:31 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-21 3:02 [PATCH v2 2/2] HID: google: Add of_match table to Whiskers switch device Ikjoon Jang
2019-10-23 0:30 ` Dmitry Torokhov
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).