[src/netbsd-7]: src/sys/dev/mii Pull up following revision(s) (requested by n...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f308f5eb27d1
branches:  netbsd-7
changeset: 798858:f308f5eb27d1
user:      martin <martin%NetBSD.org@localhost>
date:      Sat Jan 17 13:50:57 2015 +0000

description:
Pull up following revision(s) (requested by nonaka in ticket #434):
        sys/dev/mii/rgephy.c: revision 1.36, 1.37

Add support for Realtek RTL8251.

diffstat:

 sys/dev/mii/rgephy.c |  16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)

diffs (58 lines):

diff -r 3a4401a9f478 -r f308f5eb27d1 sys/dev/mii/rgephy.c
--- a/sys/dev/mii/rgephy.c      Sat Jan 17 13:46:39 2015 +0000
+++ b/sys/dev/mii/rgephy.c      Sat Jan 17 13:50:57 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rgephy.c,v 1.35 2013/12/17 16:00:23 martin Exp $       */
+/*     $NetBSD: rgephy.c,v 1.35.4.1 2015/01/17 13:50:57 martin Exp $   */
 
 /*
  * Copyright (c) 2003
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rgephy.c,v 1.35 2013/12/17 16:00:23 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rgephy.c,v 1.35.4.1 2015/01/17 13:50:57 martin Exp $");
 
 
 /*
@@ -87,6 +87,9 @@
        { MII_OUI_REALTEK,              MII_MODEL_REALTEK_RTL8169S,
          MII_STR_REALTEK_RTL8169S },
 
+       { MII_OUI_REALTEK,              MII_MODEL_REALTEK_RTL8251,
+         MII_STR_REALTEK_RTL8251 },
+
        { 0,                            0,
          NULL }
 };
@@ -453,7 +456,8 @@
        uint32_t bmsr;
        int i;
 
-       if (sc->mii_mpd_rev < 2) {
+       if (sc->mii_mpd_model != MII_MODEL_REALTEK_RTL8251 &&
+           sc->mii_mpd_rev < 2) {
                PHY_WRITE(sc, MII_BMCR, BMCR_PDOWN);
                DELAY(1000);
        }
@@ -487,7 +491,8 @@
 {
        int val;
 
-       if (sc->mii_mpd_rev >= 2)
+       if (sc->mii_mpd_model == MII_MODEL_REALTEK_RTL8251 ||
+           sc->mii_mpd_rev >= 2)
                return;
 
 #if 1
@@ -587,7 +592,8 @@
        mii_phy_reset(sc);
        DELAY(1000);
 
-       if (sc->mii_mpd_rev < 2) {
+       if (sc->mii_mpd_model != MII_MODEL_REALTEK_RTL8251 &&
+           sc->mii_mpd_rev < 2) {
                rgephy_load_dspcode(sc);
        } else if (sc->mii_mpd_rev == 3) {
                /* RTL8211C(L) */