diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2006-04-29 12:04:27 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2006-04-29 12:04:27 +0000 |
| commit | 02d82c2fa932ce7589a288c4db877a7b14a0b4a0 (patch) | |
| tree | f061bb158bfb8e2e6592993a24ad87cf198637a5 /sys/dev/i2c/i2c_scan.c | |
| parent | 4ab29375d7941f3b6224085715e9c6ec777ccdc2 (diff) | |
bring back skip_fc SMI workaround for max6657 chips; ok kettenis@
Diffstat (limited to 'sys/dev/i2c/i2c_scan.c')
| -rw-r--r-- | sys/dev/i2c/i2c_scan.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/dev/i2c/i2c_scan.c b/sys/dev/i2c/i2c_scan.c index de141b58a7b..6cddef7cc82 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.81 2006/04/17 18:33:00 kettenis Exp $ */ +/* $OpenBSD: i2c_scan.c,v 1.82 2006/04/29 12:04:26 djm Exp $ */ /* * Copyright (c) 2005 Theo de Raadt <deraadt@openbsd.org> @@ -510,9 +510,10 @@ iic_probe(struct device *self, struct i2cbus_attach_args *iba, u_int8_t addr) name = "max6646"; /* max6647/8/9, max6692 */ else if ((addr == 0x4c || addr == 0x4d || addr == 0x4e) && (iicprobe(0x02) & 0x2b) == 0 && - (iicprobe(0x03) & 0x0f) == 0 && iicprobe(0x04) <= 0x09) + (iicprobe(0x03) & 0x0f) == 0 && iicprobe(0x04) <= 0x09) { name = "max6657"; /* max6658, max6659 */ - else if ((addr >= 0x48 && addr <= 0x4f) && + skip_fc = 1; + } else if ((addr >= 0x48 && addr <= 0x4f) && (iicprobe(0x02) & 0x2b) == 0 && (iicprobe(0x03) & 0x0f) == 0) name = "max6642"; |