diff options
author | Jonathan Gray <jsg@cvs.openbsd.org> | 2007-10-08 05:39:20 +0000 |
---|---|---|
committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2007-10-08 05:39:20 +0000 |
commit | 115d741297a95f9b0a43fc0e3ebaee9ddfe4804c (patch) | |
tree | 36ac92a33edb6bb054c4294783541b921af838c5 /sys/dev/i2c | |
parent | 7569420e54564a12dd92219b95b9d5f87a7bd466 (diff) |
To identity PC133 we need to check cycle time as modules
often identify as PC100.
Diffstat (limited to 'sys/dev/i2c')
-rw-r--r-- | sys/dev/i2c/spdmem.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/sys/dev/i2c/spdmem.c b/sys/dev/i2c/spdmem.c index 624cfc8065d..778af8b902f 100644 --- a/sys/dev/i2c/spdmem.c +++ b/sys/dev/i2c/spdmem.c @@ -1,4 +1,4 @@ -/* $OpenBSD: spdmem.c,v 1.5 2007/10/08 05:11:14 jsg Exp $ */ +/* $OpenBSD: spdmem.c,v 1.6 2007/10/08 05:39:19 jsg Exp $ */ /* $NetBSD: spdmem.c,v 1.3 2007/09/20 23:09:59 xtraeme Exp $ */ /* @@ -95,6 +95,7 @@ #define SPDMEM_SDR_ROWS 0x00 #define SPDMEM_SDR_COLS 0x01 #define SPDMEM_SDR_BANKS 0x02 +#define SPDMEM_SDR_CYCLE 0x06 #define SPDMEM_SDR_BANKS_PER_CHIP 0x0e #define SPDMEM_SDR_SUPERSET 0x1d @@ -356,10 +357,12 @@ spdmem_attach(struct device *parent, struct device *self, void *aux) if (s->sm_len >= 128) { switch(spdmem_read(sc, SPDMEM_SDR_FREQUENCY)) { case SPDMEM_SDR_FREQ_100: - p_clk = 100; - break; case SPDMEM_SDR_FREQ_133: - p_clk = 133; + /* We need to check ns to decide here */ + if (s->sm_data[SPDMEM_SDR_CYCLE] < 0x80) + p_clk = 133; + else + p_clk = 100; break; case SPDMEM_SDR_FREQ_66: default: |