iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
- device tree match for Google Whiskers device from Ikjoon Jang
This commit is contained in:
Jiri Kosina 2021-06-30 09:05:31 +02:00
commit 7f1f380398
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/hid/hid-google-hammer.c
View File

@ -17,6 +17,7 @@
#include <linux/hid.h> #include <linux/hid.h>
#include <linux/leds.h> #include <linux/leds.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/of.h>
#include <linux/platform_data/cros_ec_commands.h> #include <linux/platform_data/cros_ec_commands.h>
#include <linux/platform_data/cros_ec_proto.h> #include <linux/platform_data/cros_ec_proto.h>
#include <linux/platform_device.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); 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 = { static struct platform_driver cbas_ec_driver = {
.probe = cbas_ec_probe, .probe = cbas_ec_probe,
.remove = cbas_ec_remove, .remove = cbas_ec_remove,
.driver = { .driver = {
.name = "cbas_ec", .name = "cbas_ec",
.acpi_match_table = ACPI_PTR(cbas_ec_acpi_ids), .acpi_match_table = ACPI_PTR(cbas_ec_acpi_ids),
.of_match_table = of_match_ptr(cbas_ec_of_match),
.pm = &cbas_ec_pm_ops, .pm = &cbas_ec_pm_ops,
}, },
}; };