Commit 7b2171d7 authored by Dudley Du's avatar Dudley Du Committed by Dmitry Torokhov

Input: cyapa - add acpi device id support

Add acpi device tree support.
acpi device id "CYAP0000" is for old gen3 trackpad devices.
acpi device id "CYAP0001" is for new gen5 trackpad devices.
Signed-off-by: default avatarDudley Du <dudl@cypress.com>
Tested-by: default avatarJeremiah Mahler <jmmahler@gmail.com>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent daceed1e
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <linux/pm_runtime.h> #include <linux/pm_runtime.h>
#include <linux/acpi.h>
#include "cyapa.h" #include "cyapa.h"
...@@ -1369,11 +1370,21 @@ static const struct i2c_device_id cyapa_id_table[] = { ...@@ -1369,11 +1370,21 @@ static const struct i2c_device_id cyapa_id_table[] = {
}; };
MODULE_DEVICE_TABLE(i2c, cyapa_id_table); MODULE_DEVICE_TABLE(i2c, cyapa_id_table);
#ifdef CONFIG_ACPI
static const struct acpi_device_id cyapa_acpi_id[] = {
{ "CYAP0000", 0 }, /* Gen3 trackpad with 0x67 I2C address. */
{ "CYAP0001", 0 }, /* Gen5 trackpad with 0x24 I2C address. */
{ }
};
MODULE_DEVICE_TABLE(acpi, cyapa_acpi_id);
#endif
static struct i2c_driver cyapa_driver = { static struct i2c_driver cyapa_driver = {
.driver = { .driver = {
.name = "cyapa", .name = "cyapa",
.owner = THIS_MODULE, .owner = THIS_MODULE,
.pm = &cyapa_pm_ops, .pm = &cyapa_pm_ops,
.acpi_match_table = ACPI_PTR(cyapa_acpi_id),
}, },
.probe = cyapa_probe, .probe = cyapa_probe,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment