diff options
| author | Constantine A. Murenin <cnst@cvs.openbsd.org> | 2009-07-10 00:17:31 +0000 |
|---|---|---|
| committer | Constantine A. Murenin <cnst@cvs.openbsd.org> | 2009-07-10 00:17:31 +0000 |
| commit | 57a68908fa56260bd124a1be1ab679678a3a34fd (patch) | |
| tree | 9f131ecada4ebacc46847791bacf274bd69c96b4 | |
| parent | fc3c5c0ef9e1177f11a321a74510b4558d24f0c6 (diff) | |
support onsemi's cat34ts02 and cat6095; ok deraadt
| -rw-r--r-- | share/man/man4/sdtemp.4 | 6 | ||||
| -rw-r--r-- | sys/dev/i2c/i2c_scan.c | 6 | ||||
| -rw-r--r-- | sys/dev/i2c/sdtemp.c | 5 |
3 files changed, 11 insertions, 6 deletions
diff --git a/share/man/man4/sdtemp.4 b/share/man/man4/sdtemp.4 index adfe7eb776e..e2638951948 100644 --- a/share/man/man4/sdtemp.4 +++ b/share/man/man4/sdtemp.4 @@ -1,4 +1,4 @@ -.\" $OpenBSD: sdtemp.4,v 1.6 2008/11/13 17:57:19 deraadt Exp $ +.\" $OpenBSD: sdtemp.4,v 1.7 2009/07/10 00:17:30 cnst Exp $ .\" .\" Copyright (c) 2008 Theo de Raadt <deraadt@openbsd.org> .\" @@ -14,7 +14,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: November 13 2008 $ +.Dd $Mdocdate: July 10 2009 $ .Dt SDTEMP 4 .Os .Sh NAME @@ -30,7 +30,7 @@ modules which contain sensor chips defined in JEDEC JC-42.4. .Pp Current sensor chips include the NXP SE97, NXP SE98, Microchip MCP9805, Microchip MCP98242, ST STTS424, -and AD ADT7408. +AD ADT7408, ON CAT6095 and ON CAT34TS02. .Sh SEE ALSO .Xr iic 4 .Sh HISTORY diff --git a/sys/dev/i2c/i2c_scan.c b/sys/dev/i2c/i2c_scan.c index 5709b57583a..33894dfeeea 100644 --- a/sys/dev/i2c/i2c_scan.c +++ b/sys/dev/i2c/i2c_scan.c @@ -1,4 +1,4 @@ -/* $OpenBSD: i2c_scan.c,v 1.131 2009/03/14 06:31:48 deraadt Exp $ */ +/* $OpenBSD: i2c_scan.c,v 1.132 2009/07/10 00:17:30 cnst Exp $ */ /* * Copyright (c) 2005 Theo de Raadt <deraadt@openbsd.org> @@ -879,6 +879,10 @@ iic_probe_sensor(struct device *self, u_int8_t addr) (iicprobew(0x07) & 0xfffe) == 0x0000 && (iicprobew(0x00) == 0x002d || iicprobew(0x00) == 0x002e)) { name = "stts424e02"; + } else if ((addr & 0x18) == 0x18 && iicprobew(0x06) == 0x1b09 && + (iicprobew(0x07) & 0xffe0) == 0x0800 && + iicprobew(0x00) == 0x001f) { + name = "cat34ts02"; /* or cat6095 */ } else if (name == NULL && (addr & 0x78) == 0x48) { /* addr 0b1001xxx */ name = lm75probe(); diff --git a/sys/dev/i2c/sdtemp.c b/sys/dev/i2c/sdtemp.c index f245001ac0a..42d61b95983 100644 --- a/sys/dev/i2c/sdtemp.c +++ b/sys/dev/i2c/sdtemp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sdtemp.c,v 1.9 2009/07/10 00:07:37 cnst Exp $ */ +/* $OpenBSD: sdtemp.c,v 1.10 2009/07/10 00:17:30 cnst Exp $ */ /* * Copyright (c) 2008 Theo de Raadt @@ -61,7 +61,8 @@ sdtemp_match(struct device *parent, void *match, void *aux) strcmp(ia->ia_name, "mcp9805") == 0 || strcmp(ia->ia_name, "mcp98242") == 0 || strcmp(ia->ia_name, "adt7408") == 0 || - strcmp(ia->ia_name, "stts424e02") == 0) + strcmp(ia->ia_name, "stts424e02") == 0 || + strcmp(ia->ia_name, "cat34ts02") == 0) return (1); return (0); } |