2019-04-23 21:44:13

by Daniel G

Subject: [PATCH v2] iio: temperature: maxim_thermocouple: declare missing of table

Add missing <of_device_id> table for SPI driver relying on SPI
device match since compatible is in a DT binding or in a DTS.

Before this patch:
modinfo drivers/iio/temperature/maxim_thermocouple.ko | grep alias
alias: spi:max31855
alias: spi:max6675

After this patch:
modinfo drivers/iio/temperature/maxim_thermocouple.ko | grep alias
alias: spi:max31855
alias: spi:max6675
alias: of:N*T*Cmaxim,max31855C*
alias: of:N*T*Cmaxim,max31855
alias: of:N*T*Cmaxim,max6675C*
alias: of:N*T*Cmaxim,max6675

Reported-by: Javier Martinez Canillas <[email protected]>
Signed-off-by: Daniel Gomez <[email protected]>
---
drivers/iio/temperature/maxim_thermocouple.c | 10 ++++++++++
1 file changed, 10 insertions(+)

diff --git a/drivers/iio/temperature/maxim_thermocouple.c b/drivers/iio/temperature/maxim_thermocouple.c
index c31b963..c613a64 100644
--- a/drivers/iio/temperature/maxim_thermocouple.c
+++ b/drivers/iio/temperature/maxim_thermocouple.c
@@ -10,6 +10,8 @@
#include <linux/init.h>
#include <linux/mutex.h>
#include <linux/err.h>
+#include <linux/of.h>
+#include <linux/of_device.h>
#include <linux/spi/spi.h>
#include <linux/iio/iio.h>
#include <linux/iio/trigger.h>
@@ -262,9 +264,17 @@ static const struct spi_device_id maxim_thermocouple_id[] = {
};
MODULE_DEVICE_TABLE(spi, maxim_thermocouple_id);

+static const struct of_device_id maxim_thermocouple_of_match[] = {
+ { .compatible = "maxim,max6675" },
+ { .compatible = "maxim,max31855" },
+ { },
+};
+MODULE_DEVICE_TABLE(of, maxim_thermocouple_of_match);
+
static struct spi_driver maxim_thermocouple_driver = {
.driver = {
.name = MAXIM_THERMOCOUPLE_DRV_NAME,
+ .of_match_table = maxim_thermocouple_of_match,
},
.probe = maxim_thermocouple_probe,
.remove = maxim_thermocouple_remove,
--
2.7.4

2019-04-25 07:56:00

by Matt Ranostay

Subject: Re: [PATCH v2] iio: temperature: maxim_thermocouple: declare missing of table

On Wed, Apr 24, 2019 at 5:42 AM Daniel Gomez <[email protected]> wrote:
>
> Add missing <of_device_id> table for SPI driver relying on SPI
> device match since compatible is in a DT binding or in a DTS.
>
> Before this patch:
> modinfo drivers/iio/temperature/maxim_thermocouple.ko | grep alias
> alias: spi:max31855
> alias: spi:max6675
>
> After this patch:
> modinfo drivers/iio/temperature/maxim_thermocouple.ko | grep alias
> alias: spi:max31855
> alias: spi:max6675
> alias: of:N*T*Cmaxim,max31855C*
> alias: of:N*T*Cmaxim,max31855
> alias: of:N*T*Cmaxim,max6675C*
> alias: of:N*T*Cmaxim,max6675

Heh oops I missed that somehow in initial development.

Acked-by: Matt Ranostay <[email protected]>

>
> Reported-by: Javier Martinez Canillas <[email protected]>
> Signed-off-by: Daniel Gomez <[email protected]>
> ---
> drivers/iio/temperature/maxim_thermocouple.c | 10 ++++++++++
> 1 file changed, 10 insertions(+)
>
> diff --git a/drivers/iio/temperature/maxim_thermocouple.c b/drivers/iio/temperature/maxim_thermocouple.c
> index c31b963..c613a64 100644
> --- a/drivers/iio/temperature/maxim_thermocouple.c
> +++ b/drivers/iio/temperature/maxim_thermocouple.c
> @@ -10,6 +10,8 @@
> #include <linux/init.h>
> #include <linux/mutex.h>
> #include <linux/err.h>
> +#include <linux/of.h>
> +#include <linux/of_device.h>
> #include <linux/spi/spi.h>
> #include <linux/iio/iio.h>
> #include <linux/iio/trigger.h>
> @@ -262,9 +264,17 @@ static const struct spi_device_id maxim_thermocouple_id[] = {
> };
> MODULE_DEVICE_TABLE(spi, maxim_thermocouple_id);
>
> +static const struct of_device_id maxim_thermocouple_of_match[] = {
> + { .compatible = "maxim,max6675" },
> + { .compatible = "maxim,max31855" },
> + { },
> +};
> +MODULE_DEVICE_TABLE(of, maxim_thermocouple_of_match);
> +
> static struct spi_driver maxim_thermocouple_driver = {
> .driver = {
> .name = MAXIM_THERMOCOUPLE_DRV_NAME,
> + .of_match_table = maxim_thermocouple_of_match,
> },
> .probe = maxim_thermocouple_probe,
> .remove = maxim_thermocouple_remove,
> --
> 2.7.4
>

2019-04-27 12:57:13

by Jonathan Cameron

Subject: Re: [PATCH v2] iio: temperature: maxim_thermocouple: declare missing of table

On Thu, 25 Apr 2019 09:35:07 +0800
Matt Ranostay <[email protected]> wrote:

> On Wed, Apr 24, 2019 at 5:42 AM Daniel Gomez <[email protected]> wrote:
> >
> > Add missing <of_device_id> table for SPI driver relying on SPI
> > device match since compatible is in a DT binding or in a DTS.
> >
> > Before this patch:
> > modinfo drivers/iio/temperature/maxim_thermocouple.ko | grep alias
> > alias: spi:max31855
> > alias: spi:max6675
> >
> > After this patch:
> > modinfo drivers/iio/temperature/maxim_thermocouple.ko | grep alias
> > alias: spi:max31855
> > alias: spi:max6675
> > alias: of:N*T*Cmaxim,max31855C*
> > alias: of:N*T*Cmaxim,max31855
> > alias: of:N*T*Cmaxim,max6675C*
> > alias: of:N*T*Cmaxim,max6675
>
> Heh oops I missed that somehow in initial development.
>
> Acked-by: Matt Ranostay <[email protected]>
Applied to the togreg branch of iio.git. Given timing this may have
to wait for the next cycle to go upstream.

Thanks.
Jonathan

>
> >
> > Reported-by: Javier Martinez Canillas <[email protected]>
> > Signed-off-by: Daniel Gomez <[email protected]>
> > ---
> > drivers/iio/temperature/maxim_thermocouple.c | 10 ++++++++++
> > 1 file changed, 10 insertions(+)
> >
> > diff --git a/drivers/iio/temperature/maxim_thermocouple.c b/drivers/iio/temperature/maxim_thermocouple.c
> > index c31b963..c613a64 100644
> > --- a/drivers/iio/temperature/maxim_thermocouple.c
> > +++ b/drivers/iio/temperature/maxim_thermocouple.c
> > @@ -10,6 +10,8 @@
> > #include <linux/init.h>
> > #include <linux/mutex.h>
> > #include <linux/err.h>
> > +#include <linux/of.h>
> > +#include <linux/of_device.h>
> > #include <linux/spi/spi.h>
> > #include <linux/iio/iio.h>
> > #include <linux/iio/trigger.h>
> > @@ -262,9 +264,17 @@ static const struct spi_device_id maxim_thermocouple_id[] = {
> > };
> > MODULE_DEVICE_TABLE(spi, maxim_thermocouple_id);
> >
> > +static const struct of_device_id maxim_thermocouple_of_match[] = {
> > + { .compatible = "maxim,max6675" },
> > + { .compatible = "maxim,max31855" },
> > + { },
> > +};
> > +MODULE_DEVICE_TABLE(of, maxim_thermocouple_of_match);
> > +
> > static struct spi_driver maxim_thermocouple_driver = {
> > .driver = {
> > .name = MAXIM_THERMOCOUPLE_DRV_NAME,
> > + .of_match_table = maxim_thermocouple_of_match,
> > },
> > .probe = maxim_thermocouple_probe,
> > .remove = maxim_thermocouple_remove,
> > --
> > 2.7.4
> >