summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Kettenis <kettenis@cvs.openbsd.org>2006-01-28 11:26:52 +0000
committerMark Kettenis <kettenis@cvs.openbsd.org>2006-01-28 11:26:52 +0000
commit78cbc65e7f16ece7329179196e75de7bd3d90de0 (patch)
treeefba5c772e0679b3906935a4fce0164b50632375
parentebc76a7282487e6ef4c409ad579903a76d2d11de (diff)
Disable ds1624/ds1631/ds1721 probe.
requested by deraadt@
-rw-r--r--sys/dev/i2c/i2c_scan.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/sys/dev/i2c/i2c_scan.c b/sys/dev/i2c/i2c_scan.c
index a2d7d151b80..e1ed6284894 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.62 2006/01/23 23:07:01 kettenis Exp $ */
+/* $OpenBSD: i2c_scan.c,v 1.63 2006/01/28 11:26:51 kettenis Exp $ */
/*
* Copyright (c) 2005 Theo de Raadt <deraadt@openbsd.org>
@@ -595,6 +595,11 @@ iic_probe(struct device *self, struct i2cbus_attach_args *iba, u_int8_t addr)
} else if (name == NULL && (addr & 0x7c) == 0x48) {
name = lm75probe();
}
+#if 0
+ /*
+ * XXX This probe needs to be improved; the driver does some
+ * dangerous writes.
+ */
if (name == NULL && (addr & 0x7c) == 0x48 &&
(iicprobew(0xaa) & 0x0007) == 0x0000 &&
(iicprobew(0xa1) & 0x0007) == 0x0000 &&
@@ -608,6 +613,7 @@ iic_probe(struct device *self, struct i2cbus_attach_args *iba, u_int8_t addr)
else if ((iicprobe(0xac) & 0x2e) == 0x2e)
name = "ds1721"; /* terrible probe */
}
+#endif
if (name == NULL) {
name = amd1032cloneprobe(addr);
if (name)