diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2006-01-03 07:55:48 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2006-01-03 07:55:48 +0000 |
| commit | 99d364e6b55b36eef5a00c610641233bf585e78e (patch) | |
| tree | a9d7baf699d4da5d777e4d56dc318b965dfa9771 /sys/dev | |
| parent | 806b6ee6d6071027814c4f64e03a7a3f8ff6dd73 (diff) | |
Use "official" chip part names/numbers for matching.
ok deraadt@
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/i2c/adm1021.c | 3 | ||||
| -rw-r--r-- | sys/dev/i2c/i2c_scan.c | 8 |
2 files changed, 5 insertions, 6 deletions
diff --git a/sys/dev/i2c/adm1021.c b/sys/dev/i2c/adm1021.c index dc9554334e4..45a5149e56b 100644 --- a/sys/dev/i2c/adm1021.c +++ b/sys/dev/i2c/adm1021.c @@ -1,4 +1,4 @@ -/* $OpenBSD: adm1021.c,v 1.19 2006/01/02 03:13:08 deraadt Exp $ */ +/* $OpenBSD: adm1021.c,v 1.20 2006/01/03 07:55:47 kettenis Exp $ */ /* * Copyright (c) 2005 Theo de Raadt @@ -69,7 +69,6 @@ admtemp_match(struct device *parent, void *match, void *aux) if (strcmp(ia->ia_name, "adm1021") == 0 || strcmp(ia->ia_name, "adm1032") == 0 || strcmp(ia->ia_name, "xeontemp") == 0 || - strcmp(ia->ia_name, "maxim1617") == 0 || strcmp(ia->ia_name, "max1617") == 0) return (1); return (0); diff --git a/sys/dev/i2c/i2c_scan.c b/sys/dev/i2c/i2c_scan.c index b29f1cba69a..803de921b51 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.47 2005/12/31 20:54:50 miod Exp $ */ +/* $OpenBSD: i2c_scan.c,v 1.48 2006/01/03 07:55:47 kettenis Exp $ */ /* * Copyright (c) 2005 Theo de Raadt <deraadt@openbsd.org> @@ -198,9 +198,9 @@ amd1032cloneprobe(u_int8_t addr) if (iicprobe(reg) != val) return (NULL); } - /* 0xfe may be maxim, or some other vendor */ + /* 0xfe may be Maxim, or some other vendor */ if (iicprobe(0xfe) == 0x4d) - return ("maxim1617"); + return ("max1617"); /* * "xeontemp" is the name we choose for clone chips * which have all sorts of buggy bus interactions, such @@ -394,7 +394,7 @@ iic_probe(struct device *self, struct i2cbus_attach_args *iba, u_int8_t addr) (iicprobe(0x03) & 0x2a) == 0 && iicprobe(0x04) <= 0x09) name = "lm86"; } else if (iicprobe(0xfe) == 0x4d && iicprobe(0xff) == 0x08) { - name = "maxim6690"; /* somewhat similar to lm90 */ + name = "max6690"; /* somewhat similar to lm90 */ } else if (iicprobe(0xfe) == 0x41 && (addr == 0x4c || addr == 0x4d) && (iicprobe(0x03) & 0x2a) == 0 && iicprobe(0x04) <= 0x09) { name = "adm1032"; |