diff options
| author | Rabin Vincent <rabin@rab.in> | 2015-07-19 00:29:14 +0200 |
|---|---|---|
| committer | Guenter Roeck <linux@roeck-us.net> | 2015-08-09 13:44:27 -0700 |
| commit | a1dc86ebd2f2eb6652c8be9311c16acccd1708f8 (patch) | |
| tree | b037c01de0062470ce69eede5eb3dfa99e7ec761 /drivers/hwmon/lm70.c | |
| parent | aeaa4d9f812bfd841643b37f65c6b6597045be37 (diff) | |
| download | linux-stable-a1dc86ebd2f2eb6652c8be9311c16acccd1708f8.tar.gz linux-stable-a1dc86ebd2f2eb6652c8be9311c16acccd1708f8.tar.bz2 linux-stable-a1dc86ebd2f2eb6652c8be9311c16acccd1708f8.zip | |
hwmon: (lm70) add device tree support
Allow the lm70 to be probed from a device tree.
Signed-off-by: Rabin Vincent <rabin@rab.in>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Diffstat (limited to 'drivers/hwmon/lm70.c')
| -rw-r--r-- | drivers/hwmon/lm70.c | 34 |
1 files changed, 33 insertions, 1 deletions
diff --git a/drivers/hwmon/lm70.c b/drivers/hwmon/lm70.c index 97204dce162d..9296e9daf774 100644 --- a/drivers/hwmon/lm70.c +++ b/drivers/hwmon/lm70.c @@ -37,6 +37,7 @@ #include <linux/mod_devicetable.h> #include <linux/spi/spi.h> #include <linux/slab.h> +#include <linux/of_device.h> #define DRVNAME "lm70" @@ -130,11 +131,41 @@ ATTRIBUTE_GROUPS(lm70); /*----------------------------------------------------------------------*/ +#ifdef CONFIG_OF +static const struct of_device_id lm70_of_ids[] = { + { + .compatible = "ti,lm70", + .data = (void *) LM70_CHIP_LM70, + }, + { + .compatible = "ti,tmp121", + .data = (void *) LM70_CHIP_TMP121, + }, + { + .compatible = "ti,lm71", + .data = (void *) LM70_CHIP_LM71, + }, + { + .compatible = "ti,lm74", + .data = (void *) LM70_CHIP_LM74, + }, + {}, +}; +MODULE_DEVICE_TABLE(of, lm70_of_ids); +#endif + static int lm70_probe(struct spi_device *spi) { - int chip = spi_get_device_id(spi)->driver_data; + const struct of_device_id *match; struct device *hwmon_dev; struct lm70 *p_lm70; + int chip; + + match = of_match_device(lm70_of_ids, &spi->dev); + if (match) + chip = (int)(uintptr_t)match->data; + else + chip = spi_get_device_id(spi)->driver_data; /* signaling is SPI_MODE_0 */ if (spi->mode & (SPI_CPOL | SPI_CPHA)) @@ -169,6 +200,7 @@ static struct spi_driver lm70_driver = { .driver = { .name = "lm70", .owner = THIS_MODULE, + .of_match_table = of_match_ptr(lm70_of_ids), }, .id_table = lm70_ids, .probe = lm70_probe, |