| Message ID | 1421390055-32760-13-git-send-email-dudl@cypress.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Jan 16, 2015 at 02:34:15PM +0800, Dudley Du wrote: > 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. > TEST=test on Chromebooks. > > Signed-off-by: Dudley Du <dudl@cypress.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 5f9b24a..9dc9f65 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" > > > @@ -1356,11 +1357,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), I do not think you should guard it with CONFIG_ACPI, so I dropped it. > +#endif > }, > > .probe = cyapa_probe, > -- > 1.9.1 > Thanks.
> -----Original Message----- > From: Dmitry Torokhov [mailto:dmitry.torokhov@gmail.com] > Sent: 2015?1?18? 16:28 > To: Dudley Du > Cc: jmmahler@gmail.com; rydberg@euromail.se; bleung@google.com; > linux-input@vger.kernel.org; linux-kernel@vger.kernel.org > Subject: Re: [PATCH v18 12/12] input: cyapa: add acpi device id support > > On Fri, Jan 16, 2015 at 02:34:15PM +0800, Dudley Du wrote: > > 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. > > TEST=test on Chromebooks. > > > > Signed-off-by: Dudley Du <dudl@cypress.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 5f9b24a..9dc9f65 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" > > > > > > @@ -1356,11 +1357,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), > > I do not think you should guard it with CONFIG_ACPI, so I dropped it. Thanks. > > > +#endif > > }, > > > > .probe = cyapa_probe, > > -- > > 1.9.1 > > > > Thanks. > > -- > Dmitry This message and any attachments may contain Cypress (or its subsidiaries) confidential information. If it has been received in error, please advise the sender and immediately delete this message. -- 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 5f9b24a..9dc9f65 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" @@ -1356,11 +1357,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 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 <dudl@cypress.com> --- drivers/input/mouse/cyapa.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)