| Message ID | 20210615103014.798-4-alistair@alistair23.me (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Add Wacom I2C support to rM2 | expand |
On Tue, Jun 15, 2021 at 08:30:08PM +1000, Alistair Francis wrote: > Allow the wacom-i2c device to be exposed via device tree. > > Signed-off-by: Alistair Francis <alistair@alistair23.me> > --- > drivers/input/touchscreen/wacom_i2c.c | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/drivers/input/touchscreen/wacom_i2c.c b/drivers/input/touchscreen/wacom_i2c.c > index 22826c387da5..6053595f2b30 100644 > --- a/drivers/input/touchscreen/wacom_i2c.c > +++ b/drivers/input/touchscreen/wacom_i2c.c > @@ -12,6 +12,7 @@ > #include <linux/slab.h> > #include <linux/irq.h> > #include <linux/interrupt.h> > +#include <linux/of.h> > #include <asm/unaligned.h> > > #define WACOM_CMD_QUERY0 0x04 > @@ -241,10 +242,17 @@ static const struct i2c_device_id wacom_i2c_id[] = { > }; > MODULE_DEVICE_TABLE(i2c, wacom_i2c_id); > > +static const struct of_device_id wacom_i2c_of_match_table[] = { > + { .compatible = "wacom,i2c-30" }, What is this compatible? > + {} > +}; > +MODULE_DEVICE_TABLE(of, wacom_i2c_of_match_table); > + > static struct i2c_driver wacom_i2c_driver = { > .driver = { > .name = "wacom_i2c", > .pm = &wacom_i2c_pm, > + .of_match_table = wacom_i2c_of_match_table, > }, > > .probe = wacom_i2c_probe, > -- > 2.31.1 >
On Wed, Jun 16, 2021 at 2:55 AM Dmitry Torokhov <dmitry.torokhov@gmail.com> wrote: > > On Tue, Jun 15, 2021 at 08:30:08PM +1000, Alistair Francis wrote: > > Allow the wacom-i2c device to be exposed via device tree. > > > > Signed-off-by: Alistair Francis <alistair@alistair23.me> > > --- > > drivers/input/touchscreen/wacom_i2c.c | 8 ++++++++ > > 1 file changed, 8 insertions(+) > > > > diff --git a/drivers/input/touchscreen/wacom_i2c.c b/drivers/input/touchscreen/wacom_i2c.c > > index 22826c387da5..6053595f2b30 100644 > > --- a/drivers/input/touchscreen/wacom_i2c.c > > +++ b/drivers/input/touchscreen/wacom_i2c.c > > @@ -12,6 +12,7 @@ > > #include <linux/slab.h> > > #include <linux/irq.h> > > #include <linux/interrupt.h> > > +#include <linux/of.h> > > #include <asm/unaligned.h> > > > > #define WACOM_CMD_QUERY0 0x04 > > @@ -241,10 +242,17 @@ static const struct i2c_device_id wacom_i2c_id[] = { > > }; > > MODULE_DEVICE_TABLE(i2c, wacom_i2c_id); > > > > +static const struct of_device_id wacom_i2c_of_match_table[] = { > > + { .compatible = "wacom,i2c-30" }, > > What is this compatible? Sorry, I updated it here but missed the previous patch documentation. It's wacom, connected via I2C and then version 30. I'll fixup the documentation. Alistair > > > + {} > > +}; > > +MODULE_DEVICE_TABLE(of, wacom_i2c_of_match_table); > > + > > static struct i2c_driver wacom_i2c_driver = { > > .driver = { > > .name = "wacom_i2c", > > .pm = &wacom_i2c_pm, > > + .of_match_table = wacom_i2c_of_match_table, > > }, > > > > .probe = wacom_i2c_probe, > > -- > > 2.31.1 > > > > -- > Dmitry
diff --git a/drivers/input/touchscreen/wacom_i2c.c b/drivers/input/touchscreen/wacom_i2c.c index 22826c387da5..6053595f2b30 100644 --- a/drivers/input/touchscreen/wacom_i2c.c +++ b/drivers/input/touchscreen/wacom_i2c.c @@ -12,6 +12,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/interrupt.h> +#include <linux/of.h> #include <asm/unaligned.h> #define WACOM_CMD_QUERY0 0x04 @@ -241,10 +242,17 @@ static const struct i2c_device_id wacom_i2c_id[] = { }; MODULE_DEVICE_TABLE(i2c, wacom_i2c_id); +static const struct of_device_id wacom_i2c_of_match_table[] = { + { .compatible = "wacom,i2c-30" }, + {} +}; +MODULE_DEVICE_TABLE(of, wacom_i2c_of_match_table); + static struct i2c_driver wacom_i2c_driver = { .driver = { .name = "wacom_i2c", .pm = &wacom_i2c_pm, + .of_match_table = wacom_i2c_of_match_table, }, .probe = wacom_i2c_probe,
Allow the wacom-i2c device to be exposed via device tree. Signed-off-by: Alistair Francis <alistair@alistair23.me> --- drivers/input/touchscreen/wacom_i2c.c | 8 ++++++++ 1 file changed, 8 insertions(+)