diff options
| author | Brad Smith <brad@cvs.openbsd.org> | 2006-08-17 21:56:43 +0000 |
|---|---|---|
| committer | Brad Smith <brad@cvs.openbsd.org> | 2006-08-17 21:56:43 +0000 |
| commit | 83099e0a441275b5d57f6c896980d5e39f0cc55a (patch) | |
| tree | 15960d18f0143b2e840c8abc1d581824bea14957 /sys | |
| parent | fc104a9f5b9c2f8f4e7496af7daa8646d436378f (diff) | |
remove the Yukon Lite workaround which is not being used in the msk(4) driver.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/pci/if_msk.c | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/sys/dev/pci/if_msk.c b/sys/dev/pci/if_msk.c index 02f8f333513..1fff7513462 100644 --- a/sys/dev/pci/if_msk.c +++ b/sys/dev/pci/if_msk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_msk.c,v 1.9 2006/08/17 21:37:44 brad Exp $ */ +/* $OpenBSD: if_msk.c,v 1.10 2006/08/17 21:56:42 brad Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 @@ -1856,18 +1856,6 @@ msk_init_yukon(struct sk_if_softc *sc_if) DPRINTFN(2, ("msk_init_yukon: start: sk_csr=%#x\n", CSR_READ_4(sc_if->sk_softc, SK_CSR))); - if (sc->sk_type == SK_YUKON_LITE && - sc->sk_rev >= SK_YUKON_LITE_REV_A3) { - /* - * Workaround code for COMA mode, set PHY reset. - * Otherwise it will not correctly take chip out of - * powerdown (coma) - */ - v = sk_win_read_4(sc, SK_GPIO); - v |= SK_GPIO_DIR9 | SK_GPIO_DAT9; - sk_win_write_4(sc, SK_GPIO, v); - } - DPRINTFN(6, ("msk_init_yukon: 1\n")); /* GMAC and GPHY Reset */ @@ -1877,17 +1865,6 @@ msk_init_yukon(struct sk_if_softc *sc_if) DPRINTFN(6, ("msk_init_yukon: 2\n")); - if (sc->sk_type == SK_YUKON_LITE && - sc->sk_rev >= SK_YUKON_LITE_REV_A3) { - /* - * Workaround code for COMA mode, clear PHY reset - */ - v = sk_win_read_4(sc, SK_GPIO); - v |= SK_GPIO_DIR9; - v &= ~SK_GPIO_DAT9; - sk_win_write_4(sc, SK_GPIO, v); - } - #if 0 phy = SK_GPHY_INT_POL_HI | SK_GPHY_DIS_FC | SK_GPHY_DIS_SLEEP | SK_GPHY_ENA_XC | SK_GPHY_ANEG_ALL | SK_GPHY_ENA_PAUSE; |