Module Name: src
Committed By: martin
Date: Thu Mar 7 17:19:38 UTC 2019
Modified Files:
src/sys/dev/mii [netbsd-8]: makphy.c
Log Message:
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
To generate a diff of this commit:
cvs rdiff -u -r1.42.8.1 -r1.42.8.2 src/sys/dev/mii/makphy.c
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/makphy.c
diff -u src/sys/dev/mii/makphy.c:1.42.8.1 src/sys/dev/mii/makphy.c:1.42.8.2
--- src/sys/dev/mii/makphy.c:1.42.8.1 Thu Jan 17 17:23:02 2019
+++ src/sys/dev/mii/makphy.c Thu Mar 7 17:19:38 2019
@@ -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 @@ static const struct mii_phydesc makphys[
{ 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 @@ static const struct mii_phydesc makphys[
{ 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 },
