Input: cyapa - add acpi device id support
authorDudley Du <dudl@cypress.com>
Sun, 18 Jan 2015 06:18:59 +0000 (22:18 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Sun, 18 Jan 2015 08:10:33 +0000 (00:10 -0800)
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: Dudley Du <dudl@cypress.com>
Tested-by: Jeremiah Mahler <jmmahler@gmail.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
drivers/input/mouse/cyapa.c

index f59553f72dfac4ddbe7dcebaec2703bb840d0ca1..64c6128304cf4ba97177415a3228e4477b9e42e5 100644 (file)
@@ -24,6 +24,7 @@
 #include <linux/slab.h>
 #include <linux/uaccess.h>
 #include <linux/pm_runtime.h>
+#include <linux/acpi.h>
 #include "cyapa.h"
 
 
@@ -1369,11 +1370,21 @@ static const struct i2c_device_id 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 = {
        .driver = {
                .name = "cyapa",
                .owner = THIS_MODULE,
                .pm = &cyapa_pm_ops,
+               .acpi_match_table = ACPI_PTR(cyapa_acpi_id),
        },
 
        .probe = cyapa_probe,