Skip to contentSkip to conversation

iio: temperature: maxim_thermocouple: declare missing of table

PATCH Applied Daniel Gomez 3 participants 3 messages Apr 23, 2019 – Apr 27, 2019 IIO

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 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
---
 drivers/iio/temperature/maxim_thermocouple.c | 10 ++++++++++
 1 file changed, 10 insertions(+)
drivers/iio/temperature/maxim_thermocouple.c +10 -0
index c31b963..c613a64 100644
@@ -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,
Signature · 1 line
2.7.4
Acked-by on v2 1/1
#1 lore raw
Quoted 9 lines · Daniel Gomez

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
Quoted 8 lines

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.

Quoted 41 lines
---
 drivers/iio/temperature/maxim_thermocouple.c | 10 ++++++++++
 1 file changed, 10 insertions(+)
drivers/iio/temperature/maxim_thermocouple.c +10 -1
index c31b963..c613a64 100644
@@ -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

maintainer Applied
#2 lore raw
Quoted 19 lines · On Thu, 25 Apr 2019 09:35:07 +0800 Matt Ranostay <[email protected]>…
Quoted 9 lines · Daniel Gomez

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
Quoted 8 lines

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  
Quoted 3 lines

Heh oops I missed that somehow in initial development.

Applied to the togreg branch of iio.git. Given timing this may have to wait for the next cycle to go upstream.

Thanks.
Jonathan

Quoted 42 lines
Quoted 42 lines
---
 drivers/iio/temperature/maxim_thermocouple.c | 10 ++++++++++
 1 file changed, 10 insertions(+)
drivers/iio/temperature/maxim_thermocouple.c +10 -1
index c31b963..c613a64 100644
@@ -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