Module Name: src
Committed By: msaitoh
Date: Sun Apr 19 11:17:46 UTC 2009
Modified Files:
src/sys/dev/mii: files.mii makphy.c makphyreg.h miidevs
Log Message:
Oooops. Back out some of previous my commit.
To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/sys/dev/mii/files.mii
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/mii/makphy.c
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/mii/makphyreg.h
cvs rdiff -u -r1.86 -r1.87 src/sys/dev/mii/miidevs
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/mii/files.mii
diff -u src/sys/dev/mii/files.mii:1.43 src/sys/dev/mii/files.mii:1.44
--- src/sys/dev/mii/files.mii:1.43 Sun Apr 19 11:10:36 2009
+++ src/sys/dev/mii/files.mii Sun Apr 19 11:17:46 2009
@@ -1,4 +1,4 @@
-# $NetBSD: files.mii,v 1.43 2009/04/19 11:10:36 msaitoh Exp $
+# $NetBSD: files.mii,v 1.44 2009/04/19 11:17:46 msaitoh Exp $
defflag opt_mii.h MIIVERBOSE
@@ -24,10 +24,6 @@
attach amhphy at mii
file dev/mii/amhphy.c amhphy
-device bmphy: mii_phy
-attach bmphy at mii
-file dev/mii/bmphy.c bmphy
-
device bmtphy: mii_phy
attach bmtphy at mii
file dev/mii/bmtphy.c bmtphy
Index: src/sys/dev/mii/makphy.c
diff -u src/sys/dev/mii/makphy.c:1.30 src/sys/dev/mii/makphy.c:1.31
--- src/sys/dev/mii/makphy.c:1.30 Sun Apr 19 11:10:36 2009
+++ src/sys/dev/mii/makphy.c Sun Apr 19 11:17:46 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: makphy.c,v 1.30 2009/04/19 11:10:36 msaitoh Exp $ */
+/* $NetBSD: makphy.c,v 1.31 2009/04/19 11:17:46 msaitoh Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: makphy.c,v 1.30 2009/04/19 11:10:36 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: makphy.c,v 1.31 2009/04/19 11:17:46 msaitoh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -167,24 +167,10 @@
makphy_reset(struct mii_softc *sc)
{
uint16_t pscr;
-#if 0
- uint16_t reg;
-#endif
/* Assert CRS on transmit */
pscr = PHY_READ(sc, MII_MAKPHY_PSCR);
- pscr |= PSCR_CRS_ON_TX;
-#if 0
- pscr &= ~PSCR_MDI_XOVER_MODE(XOVER_MODE_AUTO | XOVER_MODE_MDIX);
-#endif
- PHY_WRITE(sc, MII_MAKPHY_PSCR, pscr);
-#if 0
- reg = PHY_READ(sc, MII_MAKPHY_EPSC);
- reg &= ~(EPSC_MASTER_DOWNSHIFT_MASK | EPSC_SLABE_DOWNSHIFT_MASK);
- reg |= EPSC_MASTER_DOWNSHIFT_1X | EPSC_SLABE_DOWNSHIFT_1X;
- reg |= EPSC_TX_CLK_25;
- PHY_WRITE(sc, MII_MAKPHY_EPSC, reg);
-#endif
+ PHY_WRITE(sc, MII_MAKPHY_PSCR, pscr | PSCR_CRS_ON_TX);
mii_phy_reset(sc);
}
Index: src/sys/dev/mii/makphyreg.h
diff -u src/sys/dev/mii/makphyreg.h:1.4 src/sys/dev/mii/makphyreg.h:1.5
--- src/sys/dev/mii/makphyreg.h:1.4 Sun Apr 19 11:10:36 2009
+++ src/sys/dev/mii/makphyreg.h Sun Apr 19 11:17:46 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: makphyreg.h,v 1.4 2009/04/19 11:10:36 msaitoh Exp $ */
+/* $NetBSD: makphyreg.h,v 1.5 2009/04/19 11:17:46 msaitoh Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -88,14 +88,8 @@
#define MII_MAKPHY_EPSC 0x14 /* extended PHY specific control */
#define EPSC_TX_CLK(x) ((x) << 4) /* transmit clock */
-#define EPSC_TX_CLK_2_5 0x0060
-#define EPSC_TX_CLK_25 0x0070
-#define EPSC_TX_CLK_0 0x0000
-#define EPSC_MASTER_DOWNSHIFT_MASK 0x0c00
-#define EPSC_MASTER_DOWNSHIFT_1X 0x0000
-#define EPSC_SLABE_DOWNSHIFT_MASK 0x0300
-#define EPSC_SLABE_DOWNSHIFT_1X 0x0100
-
+#define EPSC_TBI_RCLK_DIS (1U << 12) /* TBI RCLK disable */
+#define EPSC_TBI_RX_CLK125_EN (1U << 13) /* TBI RX_CLK125 enable */
#define EPSC_LINK_DOWN_NO_IDLES (1U << 15) /* 1 = lost lock detect */
#define MII_MAKPHY_REC 0x15 /* receive error counter */
Index: src/sys/dev/mii/miidevs
diff -u src/sys/dev/mii/miidevs:1.86 src/sys/dev/mii/miidevs:1.87
--- src/sys/dev/mii/miidevs:1.86 Sun Apr 19 11:10:36 2009
+++ src/sys/dev/mii/miidevs Sun Apr 19 11:17:46 2009
@@ -1,4 +1,4 @@
-$NetBSD: miidevs,v 1.86 2009/04/19 11:10:36 msaitoh Exp $
+$NetBSD: miidevs,v 1.87 2009/04/19 11:17:46 msaitoh Exp $
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -199,7 +199,6 @@
model yyINTEL I82553 0x0035 i82553 10/100 media interface
model yyINTEL I82566 0x0039 i82566 10/100/1000 media interface
model xxMARVELL I82563 0x000a i82563 10/100/1000 media interface
-model xxMARVELL I82567 0x000b i82567 10/100/1000 media interface
model yyINTEL IGP01E1000 0x0038 Intel IGP01E1000 Gigabit PHY
