diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2007-10-08 03:10:59 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2007-10-08 03:10:59 +0000 |
| commit | d0c845c7b1227d01bb96b1352d94bfa7cf9955b4 (patch) | |
| tree | ec3c723970b6f1f0dfaaf93bcc445a58a7fd6d8d | |
| parent | c11fa47ec97b2c7a1e5cc668be1fe99ae4409a26 (diff) | |
Don't skip EEPROMs in ofw i2c scan,
match on sparc64 SPD name in spdmem.
Tested on a V120.
ok deraadt@
| -rw-r--r-- | sys/arch/sparc64/dev/ofwi2c.c | 7 | ||||
| -rw-r--r-- | sys/dev/i2c/spdmem.c | 5 |
2 files changed, 4 insertions, 8 deletions
diff --git a/sys/arch/sparc64/dev/ofwi2c.c b/sys/arch/sparc64/dev/ofwi2c.c index f914e69e879..4252ee0dddf 100644 --- a/sys/arch/sparc64/dev/ofwi2c.c +++ b/sys/arch/sparc64/dev/ofwi2c.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ofwi2c.c,v 1.5 2007/03/29 17:41:33 deraadt Exp $ */ +/* $OpenBSD: ofwi2c.c,v 1.6 2007/10/08 03:10:58 jsg Exp $ */ /* * Copyright (c) 2006 Theo de Raadt @@ -83,11 +83,6 @@ ofwiic_scan(struct device *self, struct i2cbus_attach_args *iba, void *aux) if (strncmp(ia.ia_name, "i2c-", strlen("i2c-")) == 0) ia.ia_name += strlen("i2c-"); - /* skip totally boring devices */ - if (strcmp(ia.ia_name, "at24c64") == 0 || - strcmp(ia.ia_name, "at34c02") == 0) - continue; - config_found(self, &ia, iic_print); } } diff --git a/sys/dev/i2c/spdmem.c b/sys/dev/i2c/spdmem.c index 39136b3cd7b..662071b8873 100644 --- a/sys/dev/i2c/spdmem.c +++ b/sys/dev/i2c/spdmem.c @@ -1,4 +1,4 @@ -/* $OpenBSD: spdmem.c,v 1.3 2007/10/08 01:40:09 jsg Exp $ */ +/* $OpenBSD: spdmem.c,v 1.4 2007/10/08 03:10:58 jsg Exp $ */ /* $NetBSD: spdmem.c,v 1.3 2007/09/20 23:09:59 xtraeme Exp $ */ /* @@ -198,7 +198,8 @@ spdmem_match(struct device *parent, void *match, void *aux) { struct i2c_attach_args *ia = aux; - if (strcmp(ia->ia_name, "spd") == 0) + if (strcmp(ia->ia_name, "spd") == 0 || + strcmp(ia->ia_name, "at34c02") == 0) return (1); return (0); } |