[v3,2/2] HID: google: Add of_match table to Whiskers switch device.

Commit Message

Ikjoon Jang Oct. 23, 2019, 2:44 a.m. UTC

Add a device tree match table.

Signed-off-by: Ikjoon Jang <[e-mail]>
Reviewed-by: Dmitry Torokhov <[e-mail]>
---
 drivers/hid/hid-google-hammer.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

Comments

Jiri Kosina Oct. 27, 2019, 10:08 p.m. UTC | #1

On Wed, 23 Oct 2019, Ikjoon Jang wrote:

> Add a device tree match table.
> 
> Signed-off-by: Ikjoon Jang <[e-mail]>
> Reviewed-by: Dmitry Torokhov <[e-mail]>

As the dt-specific part is probably going to be more substantial here, 
feel free to add

	Acked-by: Jiri Kosina <[e-mail]>

and merge through dt tree; in case you'd like me to take it through 
hid.git, please let me know.

Thanks,

Patch

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,
 	},
 };