summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--share/man/man4/sdtemp.45
-rw-r--r--sys/dev/i2c/i2c_scan.c6
-rw-r--r--sys/dev/i2c/sdtemp.c3
3 files changed, 10 insertions, 4 deletions
diff --git a/share/man/man4/sdtemp.4 b/share/man/man4/sdtemp.4
index 4dbd8592607..588a4fed815 100644
--- a/share/man/man4/sdtemp.4
+++ b/share/man/man4/sdtemp.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sdtemp.4,v 1.2 2008/04/09 21:56:40 deraadt Exp $
+.\" $OpenBSD: sdtemp.4,v 1.3 2008/04/09 22:04:11 deraadt Exp $
.\"
.\" Copyright (c) 2008 Theo de Raadt <deraadt@openbsd.org>
.\"
@@ -28,7 +28,8 @@ The
driver retrieves temperature sensor information from memory
modules which contain sensor chips defined in JEDEC JC-42.4.
.Pp
-Current sensor chips include the NPX SE97, NPX SE98, and AD ADT7408.
+Current sensor chips include the NPX SE97, NPX SE98, Microchip MCP9805,
+and AD ADT7408.
.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 c424056d373..a8bd752dd5e 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.119 2008/04/09 21:56:40 deraadt Exp $ */
+/* $OpenBSD: i2c_scan.c,v 1.120 2008/04/09 22:04:10 deraadt Exp $ */
/*
* Copyright (c) 2005 Theo de Raadt <deraadt@openbsd.org>
@@ -855,6 +855,10 @@ iic_probe_sensor(struct device *self, u_int8_t addr)
iicprobew(0x07) == 0xa200 &&
(iicprobew(0x00) & 0xfff0) == 0x0010) {
name = "se97";
+ } else if ((addr & 0x18) == 0x18 && iicprobew(0x06) == 0x0054 &&
+ iicprobew(0x07) == 0x0000 &&
+ (iicprobew(0x00) & 0xffe0) == 0x0000) {
+ name = "mcp9805";
} else if ((addr & 0x18) == 0x18 && iicprobew(0x06) == 0x11d4 &&
(iicprobew(0x07) & 0xfff0) == 0x0800 &&
iicprobew(0x00) == 0x001d) {
diff --git a/sys/dev/i2c/sdtemp.c b/sys/dev/i2c/sdtemp.c
index 4b0a998d996..d092ad7805e 100644
--- a/sys/dev/i2c/sdtemp.c
+++ b/sys/dev/i2c/sdtemp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sdtemp.c,v 1.2 2008/04/09 21:56:40 deraadt Exp $ */
+/* $OpenBSD: sdtemp.c,v 1.3 2008/04/09 22:04:10 deraadt Exp $ */
/*
* Copyright (c) 2008 Theo de Raadt
@@ -59,6 +59,7 @@ sdtemp_match(struct device *parent, void *match, void *aux)
if (strcmp(ia->ia_name, "se97") == 0 ||
strcmp(ia->ia_name, "se98") == 0 ||
+ strcmp(ia->ia_name, "mcp9805") == 0 ||
strcmp(ia->ia_name, "adt7408") == 0)
return (1);
return (0);