diff options
| author | Dudley Du <dudl@cypress.com> | 2015-07-30 20:24:16 +0200 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-07-30 20:33:59 +0200 |
| commit | ddbb299db0e040aca8e26361ab778224eeacf9d3 (patch) | |
| tree | 09821d38eab2082a963e052a188a382a03ad9ab1 /drivers | |
| parent | Input: cyapa - add regulator vcc support (diff) | |
| download | linux-ddbb299db0e040aca8e26361ab778224eeacf9d3.tar.xz linux-ddbb299db0e040aca8e26361ab778224eeacf9d3.zip | |
Input: cyapa - introduce device tree binding
Add device tree support for Cypress trackpad devices.
Signed-off-by: Dudley Du <dudl@cypress.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/input/mouse/cyapa.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/input/mouse/cyapa.c b/drivers/input/mouse/cyapa.c index 1479ca996647..eb76b61418f3 100644 --- a/drivers/input/mouse/cyapa.c +++ b/drivers/input/mouse/cyapa.c @@ -26,6 +26,7 @@ #include <linux/uaccess.h> #include <linux/pm_runtime.h> #include <linux/acpi.h> +#include <linux/of.h> #include "cyapa.h" @@ -1487,11 +1488,20 @@ static const struct acpi_device_id cyapa_acpi_id[] = { MODULE_DEVICE_TABLE(acpi, cyapa_acpi_id); #endif +#ifdef CONFIG_OF +static const struct of_device_id cyapa_of_match[] = { + { .compatible = "cypress,cyapa" }, + { /* sentinel */ } +}; +MODULE_DEVICE_TABLE(of, cyapa_of_match); +#endif + static struct i2c_driver cyapa_driver = { .driver = { .name = "cyapa", .pm = &cyapa_pm_ops, .acpi_match_table = ACPI_PTR(cyapa_acpi_id), + .of_match_table = of_match_ptr(cyapa_of_match), }, .probe = cyapa_probe, |