---

yaml --- r: 326193 b: refs/heads/master c: 146ab28 h: refs/heads/master i: 326191: a58beec v: v3
git-mirror · Sep 24, 2012 · 7d4bf54 · 7d4bf54
1 parent c38ad25
commit 7d4bf54
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: edec5af7c5cba4a8c00c0c52fbad3b83217122da
+refs/heads/master: 146ab288bbe037aa85a233221cd8d9a84bedcf85
diff --git a/trunk/Documentation/hwmon/lm70 b/trunk/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/trunk/drivers/hwmon/lm70.c b/trunk/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);