diff options
| author | Christophe Leroy <christophe.leroy@c-s.fr> | 2012-09-04 10:40:44 +0200 |
|---|---|---|
| committer | Guenter Roeck <linux@roeck-us.net> | 2012-09-23 21:08:34 -0700 |
| commit | 146ab288bbe037aa85a233221cd8d9a84bedcf85 (patch) | |
| tree | 7f8c0cca5fcbb05b1b735f3dd1786971300adb85 | |
| parent | edec5af7c5cba4a8c00c0c52fbad3b83217122da (diff) | |
| download | talos-obmc-linux-146ab288bbe037aa85a233221cd8d9a84bedcf85.tar.gz talos-obmc-linux-146ab288bbe037aa85a233221cd8d9a84bedcf85.zip | |
hwmon: (lm70) Allow 4wire SPI bus with LM70
Removing the 3wire limitation on LM70 as the component also allows
operation on 4wire SPI bus
Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
| -rw-r--r-- | Documentation/hwmon/lm70 | 5 | ||||
| -rw-r--r-- | drivers/hwmon/lm70.c | 4 |
2 files changed, 2 insertions, 7 deletions
diff --git a/Documentation/hwmon/lm70 b/Documentation/hwmon/lm70 index 0d240291e3cc..1bb1f20951ca 100644 --- a/Documentation/hwmon/lm70 +++ b/Documentation/hwmon/lm70 @@ -31,9 +31,8 @@ As a real (in-tree) example of this "SPI protocol driver" interfacing with a "SPI master controller driver", see drivers/spi/spi_lm70llp.c and its associated documentation. -The TMP121/TMP123 are very similar; main differences are 4 wire SPI inter- -face (read only) and 13-bit temperature data (0.0625 degrees celsius reso- -lution). +The TMP121/TMP123 are very similar; main difference is 13-bit temperature +data (0.0625 degrees celsius resolution). Thanks to --------- diff --git a/drivers/hwmon/lm70.c b/drivers/hwmon/lm70.c index dd7f0cafd197..1da62f616db5 100644 --- a/drivers/hwmon/lm70.c +++ b/drivers/hwmon/lm70.c @@ -143,10 +143,6 @@ static int __devinit lm70_probe(struct spi_device *spi) if (spi->mode & (SPI_CPOL | SPI_CPHA)) return -EINVAL; - /* 3-wire link (shared SI/SO) for LM70 */ - if (chip == LM70_CHIP_LM70 && !(spi->mode & SPI_3WIRE)) - return -EINVAL; - /* NOTE: we assume 8-bit words, and convert to 16 bits manually */ p_lm70 = devm_kzalloc(&spi->dev, sizeof(*p_lm70), GFP_KERNEL); |
