diff options
| author | Jiri Kosina | 2021-06-30 09:05:31 +0200 |
|---|---|---|
| committer | Jiri Kosina | 2021-06-30 09:05:31 +0200 |
| commit | 7f1f38039820eb361567c4ed91630b51db7c7c49 (patch) | |
| tree | 11fc0767ecf80f41f5dc061cc2784bef1ac2c789 /drivers | |
| parent | fd73788ce6a580f2bd353e0f364d31b6c16dcd12 (diff) | |
| parent | 8dcaa046bf96353c878ddadda506e2708cb4b8c3 (diff) | |
Merge branch 'for-5.14/google' into for-linus
- device tree match for Google Whiskers device from Ikjoon Jang
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/hid/hid-google-hammer.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/hid/hid-google-hammer.c b/drivers/hid/hid-google-hammer.c index e60c31dd05ff..8123b871a3eb 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, }, }; |