[src/netbsd-6]: src Pull up following revision(s) (requested by jdc in ticket...

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

details:   https://anonhg.NetBSD.org/src/rev/a7a513e01b5c
branches:  netbsd-6
changeset: 774292:a7a513e01b5c
user:      riz <riz%NetBSD.org@localhost>
date:      Wed Jul 04 19:43:10 2012 +0000

description:
Pull up following revision(s) (requested by jdc in ticket #368):
        sys/dev/ic/hme.c: revision 1.88
        share/man/man4/hme.4: revision 1.10
PR kern/46424
Revert the part of revision 1.77 that altered the PHY attachment order.
Note that the PHY instance changes when a MII transceiver is connected.

diffstat:

 share/man/man4/hme.4 |   8 ++++++--
 sys/dev/ic/hme.c     |  13 +++----------
 2 files changed, 9 insertions(+), 12 deletions(-)

diffs (61 lines):

diff -r 2be13953a139 -r a7a513e01b5c share/man/man4/hme.4
--- a/share/man/man4/hme.4      Wed Jul 04 19:38:54 2012 +0000
+++ b/share/man/man4/hme.4      Wed Jul 04 19:43:10 2012 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: hme.4,v 1.9 2010/01/15 19:24:49 joerg Exp $
+.\"    $NetBSD: hme.4,v 1.9.10.1 2012/07/04 19:43:10 riz Exp $
 .\"
 .\" Copyright (c) 2001 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -27,7 +27,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd April 28, 2008
+.Dd June 23, 2012
 .Dt HME 4
 .Os
 .Sh NAME
@@ -108,3 +108,7 @@
 driver was written by
 .An Paul Kranenburg
 .Aq pk%NetBSD.org@localhost .
+.Sh BUGS
+Connecting a MII transceiver on those cards that support it will cause the
+RJ45 connector to be detected as PHY instance 1, instead of the default
+instance 0.
diff -r 2be13953a139 -r a7a513e01b5c sys/dev/ic/hme.c
--- a/sys/dev/ic/hme.c  Wed Jul 04 19:38:54 2012 +0000
+++ b/sys/dev/ic/hme.c  Wed Jul 04 19:43:10 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: hme.c,v 1.87 2012/02/02 19:43:03 tls Exp $     */
+/*     $NetBSD: hme.c,v 1.87.2.1 2012/07/04 19:43:10 riz Exp $ */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hme.c,v 1.87 2012/02/02 19:43:03 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hme.c,v 1.87.2.1 2012/07/04 19:43:10 riz Exp $");
 
 /* #define HMEDEBUG */
 
@@ -254,15 +254,8 @@
 
        hme_mifinit(sc);
 
-       /*
-        * Some HME's have an MII connector, as well as RJ45.  Try attaching
-        * the RJ45 (internal) PHY first, so that the MII PHY is always
-        * instance 1.
-        */
        mii_attach(sc->sc_dev, mii, 0xffffffff,
-                       HME_PHYAD_INTERNAL, MII_OFFSET_ANY, MIIF_FORCEANEG);
-       mii_attach(sc->sc_dev, mii, 0xffffffff,
-                       HME_PHYAD_EXTERNAL, MII_OFFSET_ANY, MIIF_FORCEANEG);
+                       MII_PHY_ANY, MII_OFFSET_ANY, MIIF_FORCEANEG);
 
        child = LIST_FIRST(&mii->mii_phys);
        if (child == NULL) {