| Message ID | 1418624603-19054-13-git-send-email-dudley.dulixin@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Dudley, On Mon, Dec 15, 2014 at 02:23:23PM +0800, Dudley Du wrote: > Add acpi device tree supported. support. > acpi device id "CYAP0000" is for old gen3 trackpad devices. > acpi device id "CYAP0001" is for new gen5 trackpad devices. > TEST=test on Chromebooks. > > Signed-off-by: Dudley Du <dudley.dulixin@gmail.com> > --- > drivers/input/mouse/cyapa.c | 13 +++++++++++++ > 1 file changed, 13 insertions(+) > > diff --git a/drivers/input/mouse/cyapa.c b/drivers/input/mouse/cyapa.c > index dac3996..9fb97e2 100644 > --- a/drivers/input/mouse/cyapa.c > +++ b/drivers/input/mouse/cyapa.c > @@ -24,6 +24,7 @@ > #include <linux/slab.h> > #include <linux/uaccess.h> > #include <linux/pm_runtime.h> > +#include <linux/acpi.h> > #include "cyapa.h" > > > @@ -1315,11 +1316,23 @@ 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, > +#ifdef CONFIG_ACPI > + .acpi_match_table = ACPI_PTR(cyapa_acpi_id), > +#endif > }, > > .probe = cyapa_probe, > -- > 1.9.1 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-input" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/input/mouse/cyapa.c b/drivers/input/mouse/cyapa.c index dac3996..9fb97e2 100644 --- a/drivers/input/mouse/cyapa.c +++ b/drivers/input/mouse/cyapa.c @@ -24,6 +24,7 @@ #include <linux/slab.h> #include <linux/uaccess.h> #include <linux/pm_runtime.h> +#include <linux/acpi.h> #include "cyapa.h" @@ -1315,11 +1316,23 @@ 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, +#ifdef CONFIG_ACPI + .acpi_match_table = ACPI_PTR(cyapa_acpi_id), +#endif }, .probe = cyapa_probe,
Add acpi device tree supported. acpi device id "CYAP0000" is for old gen3 trackpad devices. acpi device id "CYAP0001" is for new gen5 trackpad devices. TEST=test on Chromebooks. Signed-off-by: Dudley Du <dudley.dulixin@gmail.com> --- drivers/input/mouse/cyapa.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)