Module Name: src
Committed By: msaitoh
Date: Wed Jun 27 07:51:36 UTC 2018
Modified Files:
src/sys/dev/mii: rgephy.c rgephyreg.h
Log Message:
Use definitions in mii.h and mdio.h.
To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/sys/dev/mii/rgephy.c
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/mii/rgephyreg.h
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/rgephy.c
diff -u src/sys/dev/mii/rgephy.c:1.43 src/sys/dev/mii/rgephy.c:1.44
--- src/sys/dev/mii/rgephy.c:1.43 Tue Jun 19 10:36:41 2018
+++ src/sys/dev/mii/rgephy.c Wed Jun 27 07:51:36 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: rgephy.c,v 1.43 2018/06/19 10:36:41 jmcneill Exp $ */
+/* $NetBSD: rgephy.c,v 1.44 2018/06/27 07:51:36 msaitoh Exp $ */
/*
* Copyright (c) 2003
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rgephy.c,v 1.43 2018/06/19 10:36:41 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rgephy.c,v 1.44 2018/06/27 07:51:36 msaitoh Exp $");
/*
@@ -51,6 +51,7 @@ __KERNEL_RCSID(0, "$NetBSD: rgephy.c,v 1
#include <net/if_media.h>
#include <dev/mii/mii.h>
+#include <dev/mii/mdio.h>
#include <dev/mii/miivar.h>
#include <dev/mii/miidevs.h>
@@ -675,9 +676,9 @@ rgephy_reset(struct mii_softc *sc)
/* RTL8211F */
delay(10000);
/* disable EEE */
- PHY_WRITE(sc, RGEPHY_MII_MACR, 0x0007);
- PHY_WRITE(sc, RGEPHY_MII_MAADR, 0x003c);
- PHY_WRITE(sc, RGEPHY_MII_MACR, 0x4007);
- PHY_WRITE(sc, RGEPHY_MII_MAADR, 0x0000);
+ PHY_WRITE(sc, MII_MMDACR, MMDACR_FN_ADDRESS | MDIO_MMD_AN);
+ PHY_WRITE(sc, MII_MMDAADR, MDIO_AN_EEEADVERT);
+ PHY_WRITE(sc, MII_MMDACR, MMDACR_FN_DATANPI | MDIO_MMD_AN);
+ PHY_WRITE(sc, MII_MMDAADR, 0x0000);
}
}
Index: src/sys/dev/mii/rgephyreg.h
diff -u src/sys/dev/mii/rgephyreg.h:1.10 src/sys/dev/mii/rgephyreg.h:1.11
--- src/sys/dev/mii/rgephyreg.h:1.10 Tue Jun 19 10:36:41 2018
+++ src/sys/dev/mii/rgephyreg.h Wed Jun 27 07:51:36 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: rgephyreg.h,v 1.10 2018/06/19 10:36:41 jmcneill Exp $ */
+/* $NetBSD: rgephyreg.h,v 1.11 2018/06/27 07:51:36 msaitoh Exp $ */
/*
* Copyright (c) 2003
@@ -64,10 +64,6 @@
#define RGEPHY_MII_PHYCR1 0x18 /* PHY Specific control register 1 */
#define RGEPHY_PHYCR1_MDI_MMCE __BIT(9)
#define RGEPHY_PHYCR1_ALDPS_EN __BIT(2)
-#define RGEPHY_MII_MACR 0x0d /* MMD Access control register */
-#define RGEPHY_MACR_FUNCTION __BITS(15,14)
-#define RGEPHY_MACR_DEVAD __BITS(4,0)
-#define RGEPHY_MII_MAADR 0x0e /* MMD Access address data register */
#define RGEPHY_MII_PHYSR 0x1a /* PHY Specific status register */
#define RGEPHY_PHYSR_ALDPS __BIT(14)
