Merge branch 'for-5.14/google' into for-linus

- device tree match for Google Whiskers device from Ikjoon Jang

diff --git a/drivers/hid/hid-google-hammer.c b/drivers/hid/hid-google-hammer.c
index e60c31dd05ffb5f3fb427c8dca23ebe938c1def6..8123b871a3ebf7f200ce6017b60e31a2f5431700 100644 (file)
--- 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,
        },
 };