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

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

details:   https://anonhg.NetBSD.org/src/rev/f2d1fdbe0647
branches:  netbsd-8
changeset: 449466:f2d1fdbe0647
user:      martin <martin%NetBSD.org@localhost>
date:      Thu Mar 07 17:19:38 2019 +0000

description:
Pull up following revision(s) (requested by msaitoh in ticket #1208):

        sys/dev/mii/makphy.c: revision 1.53

- Add 88E1240.
- Rename E1116R_29 to E1318S

diffstat:

 sys/dev/mii/makphy.c |  11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diffs (39 lines):

diff -r 8ecb112cc3d9 -r f2d1fdbe0647 sys/dev/mii/makphy.c
--- a/sys/dev/mii/makphy.c      Thu Mar 07 17:17:09 2019 +0000
+++ b/sys/dev/mii/makphy.c      Thu Mar 07 17:19:38 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: makphy.c,v 1.42.8.1 2019/01/17 17:23:02 martin Exp $   */
+/*     $NetBSD: makphy.c,v 1.42.8.2 2019/03/07 17:19:38 martin Exp $   */
 
 /*-
  * Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: makphy.c,v 1.42.8.1 2019/01/17 17:23:02 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: makphy.c,v 1.42.8.2 2019/03/07 17:19:38 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -128,8 +128,8 @@
        { MII_OUI_xxMARVELL,            MII_MODEL_xxMARVELL_E1116R,
          MII_STR_xxMARVELL_E1116R },
 
-       { MII_OUI_xxMARVELL,            MII_MODEL_xxMARVELL_E1116R_29,
-         MII_STR_xxMARVELL_E1116R_29 },
+       { MII_OUI_xxMARVELL,            MII_MODEL_xxMARVELL_E1318S,
+         MII_STR_xxMARVELL_E1318S },
 
        { MII_OUI_xxMARVELL,            MII_MODEL_xxMARVELL_E1118,
          MII_STR_xxMARVELL_E1118 },
@@ -143,6 +143,9 @@
        { MII_OUI_xxMARVELL,            MII_MODEL_xxMARVELL_E1149R,
          MII_STR_xxMARVELL_E1149R },
 
+       { MII_OUI_xxMARVELL,            MII_MODEL_xxMARVELL_E1240,
+         MII_STR_xxMARVELL_E1240 },
+
        { MII_OUI_xxMARVELL,            MII_MODEL_xxMARVELL_E1512,
          MII_STR_xxMARVELL_E1512 },