diff mbox series

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

Message ID 20210415032958.740233-3-ikjn@chromium.org
State Accepted
Commit 8dcaa046bf96353c878ddadda506e2708cb4b8c3
Headers show
Series HID: google: add device tree bindings for Whiskers switch device | expand

Commit Message

Ikjoon Jang April 15, 2021, 3:29 a.m. UTC 
Add a device tree match table for "cros-cbas" switch device.

Signed-off-by: Ikjoon Jang <ikjn@chromium.org>
Reviewed-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Acked-by: Jiri Kosina <jkosina@suse.cz>

---

(no changes since v1)

Please note that v3 was submitted in 28 Oct 2019, 1.5yrs ago.
Link(v2): https://patchwork.kernel.org/project/linux-input/patch/20191021030158.32464-1-ikjn@chromium.org/

---
 drivers/hid/hid-google-hammer.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

Comments

Jiri Kosina May 5, 2021, 12:35 p.m. UTC | #1 
On Thu, 15 Apr 2021, Ikjoon Jang wrote:

> Add a device tree match table for "cros-cbas" switch device.


Applied, sorry for the delay.

-- 
Jiri Kosina
SUSE Labs
Ikjoon Jang May 10, 2021, 7:51 a.m. UTC | #2 
On Wed, May 5, 2021 at 8:35 PM Jiri Kosina <jikos@kernel.org> wrote:
>

> On Thu, 15 Apr 2021, Ikjoon Jang wrote:

>

> > Add a device tree match table for "cros-cbas" switch device.

>

> Applied, sorry for the delay.


Thanks a lot!

Sorry for bothering you again but I can't find
a device tree binding patch [1] in your trees.

I think dt-binding should go first before the driver part.
Can it also be applied to hid tree (or am I missing something)?

[1] http://patchwork.kernel.org/patch/12204197
     [v5,1/2] mfd: google,cros-ec: add DT bindings for a baseboard's
switch device

>

> --

> Jiri Kosina

> SUSE Labs

>
diff mbox series

Patch

diff --git a/drivers/hid/hid-google-hammer.c b/drivers/hid/hid-google-hammer.c
index d9319622da44..be4f9f3dbbba 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>
@@ -272,12 +273,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,
 	},
 };