diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2006-03-04 02:58:15 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2006-03-04 02:58:15 +0000 |
| commit | eabd16bda3cbe44dd76a08cd3f916dc2f66eaae0 (patch) | |
| tree | f20c7113f26af74e33ab3bd8d76f79db47d55e53 /sys/dev | |
| parent | d07b4171ee5e6ad7d190f81040a2d702a4bf85f7 (diff) | |
handle lm96000 (another similar chip); ok kettenis, tested by stu@spacehopper.org
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/i2c/adt7460.c | 5 | ||||
| -rw-r--r-- | sys/dev/i2c/i2c_scan.c | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/sys/dev/i2c/adt7460.c b/sys/dev/i2c/adt7460.c index 248c05a4db9..21ba07f0f46 100644 --- a/sys/dev/i2c/adt7460.c +++ b/sys/dev/i2c/adt7460.c @@ -1,4 +1,4 @@ -/* $OpenBSD: adt7460.c,v 1.6 2006/01/19 17:08:39 grange Exp $ */ +/* $OpenBSD: adt7460.c,v 1.7 2006/03/04 02:58:14 deraadt Exp $ */ /* * Copyright (c) 2005 Mark Kettenis @@ -84,7 +84,8 @@ adt_match(struct device *parent, void *match, void *aux) strcmp(ia->ia_name, "adt7476") == 0 || strcmp(ia->ia_name, "adm1027") == 0 || strcmp(ia->ia_name, "lm85") == 0 || - strcmp(ia->ia_name, "emc6d10x") == 0) + strcmp(ia->ia_name, "emc6d10x") == 0 || + strcmp(ia->ia_name, "lm96000") == 0) return (1); return (0); } diff --git a/sys/dev/i2c/i2c_scan.c b/sys/dev/i2c/i2c_scan.c index 68f03341605..409edc8db30 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.71 2006/02/26 18:38:53 grange Exp $ */ +/* $OpenBSD: i2c_scan.c,v 1.72 2006/03/04 02:58:14 deraadt Exp $ */ /* * Copyright (c) 2005 Theo de Raadt <deraadt@openbsd.org> @@ -437,7 +437,7 @@ iic_probe(struct device *self, struct i2cbus_attach_args *iba, u_int8_t addr) else if (iicprobe(0x3f) == 0x17) name = "lm86"; else if ((addr == 0x2c || addr == 0x2d || addr == 0x2e) && - iicprobe(0x3f) == 0x68 && iicprobe(0xf8) != 0x01) + iicprobe(0x3f) == 0x68) name = "lm96000"; /* adt7460 compat? */ else if ((addr == 0x2c || addr == 0x2d || addr == 0x2e) && (iicprobe(0x3f) == 0x60 || iicprobe(0x3f) == 0x62)) |