| Message ID | 20210321141049.148-4-alistair@alistair23.me |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Add Wacom I2C support to rM2 | expand |
Hi Alistair, On Sun, Mar 21, 2021 at 10:10:43AM -0400, 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 1afc6bde2891..fc0bf583d33b 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 > @@ -262,10 +263,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[] __maybe_unused = { > + { .compatible = "wacom,generic" }, > + {} > +}; > +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 = of_match_ptr(wacom_i2c_of_match_table), You need to either guard wacom_i2c_of_match_table by #ifdef CONFIG_OF or drop of_match_ptr() and assign directly as otherwise you will get "unused variable" warning. Thanks.
diff --git a/drivers/input/touchscreen/wacom_i2c.c b/drivers/input/touchscreen/wacom_i2c.c index 1afc6bde2891..fc0bf583d33b 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 @@ -262,10 +263,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[] __maybe_unused = { + { .compatible = "wacom,generic" }, + {} +}; +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 = of_match_ptr(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(+)