| Message ID | 20200318153434.62833-2-michael.auchter@ni.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/3] iio: dac: ad5686: add support for AD5338R | expand |
On 3/18/20 4:34 PM, Michael Auchter wrote: > Add of_match_table to this driver, so devices can be probed based on > device tree contents. > > Signed-off-by: Michael Auchter <michael.auchter@ni.com> > --- > drivers/iio/dac/ad5696-i2c.c | 19 +++++++++++++++++++ > 1 file changed, 19 insertions(+) > > diff --git a/drivers/iio/dac/ad5696-i2c.c b/drivers/iio/dac/ad5696-i2c.c > index f100a5fe4219..26818bccffa2 100644 > --- a/drivers/iio/dac/ad5696-i2c.c > +++ b/drivers/iio/dac/ad5696-i2c.c > @@ -88,9 +88,28 @@ static const struct i2c_device_id ad5686_i2c_id[] = { > }; > MODULE_DEVICE_TABLE(i2c, ad5686_i2c_id); > > +static const struct of_device_id ad5686_of_match[] = { > + { .compatible = "adi,ad5311r" }, > + { .compatible = "adi,ad5671r" }, > + { .compatible = "adi,ad5675r" }, > + { .compatible = "adi,ad5691r" }, > + { .compatible = "adi,ad5692r" }, > + { .compatible = "adi,ad5693" }, > + { .compatible = "adi,ad5693r" }, > + { .compatible = "adi,ad5694" }, > + { .compatible = "adi,ad5694r" }, > + { .compatible = "adi,ad5695r" }, > + { .compatible = "adi,ad5696" }, > + { .compatible = "adi,ad5696r" }, > + { .compatible = "adi,ad5338r" }, Same here, table should be ordered. > + {} > +}; > +MODULE_DEVICE_TABLE(of, ad5686_of_match); > + > static struct i2c_driver ad5686_i2c_driver = { > .driver = { > .name = "ad5696", > + .of_match_table = of_match_ptr(ad5686_of_match), > }, > .probe = ad5686_i2c_probe, > .remove = ad5686_i2c_remove, >
On Wed, Mar 18, 2020 at 5:56 PM Michael Auchter <michael.auchter@ni.com> wrote: > > Add of_match_table to this driver, so devices can be probed based on > device tree contents. > + .of_match_table = of_match_ptr(ad5686_of_match), There is no need to use of_match_ptr(). Didn't you get a compiler warning for !OF case?
diff --git a/drivers/iio/dac/ad5696-i2c.c b/drivers/iio/dac/ad5696-i2c.c index f100a5fe4219..26818bccffa2 100644 --- a/drivers/iio/dac/ad5696-i2c.c +++ b/drivers/iio/dac/ad5696-i2c.c @@ -88,9 +88,28 @@ static const struct i2c_device_id ad5686_i2c_id[] = { }; MODULE_DEVICE_TABLE(i2c, ad5686_i2c_id); +static const struct of_device_id ad5686_of_match[] = { + { .compatible = "adi,ad5311r" }, + { .compatible = "adi,ad5671r" }, + { .compatible = "adi,ad5675r" }, + { .compatible = "adi,ad5691r" }, + { .compatible = "adi,ad5692r" }, + { .compatible = "adi,ad5693" }, + { .compatible = "adi,ad5693r" }, + { .compatible = "adi,ad5694" }, + { .compatible = "adi,ad5694r" }, + { .compatible = "adi,ad5695r" }, + { .compatible = "adi,ad5696" }, + { .compatible = "adi,ad5696r" }, + { .compatible = "adi,ad5338r" }, + {} +}; +MODULE_DEVICE_TABLE(of, ad5686_of_match); + static struct i2c_driver ad5686_i2c_driver = { .driver = { .name = "ad5696", + .of_match_table = of_match_ptr(ad5686_of_match), }, .probe = ad5686_i2c_probe, .remove = ad5686_i2c_remove,
Add of_match_table to this driver, so devices can be probed based on device tree contents. Signed-off-by: Michael Auchter <michael.auchter@ni.com> --- drivers/iio/dac/ad5696-i2c.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)