Module Name: src
Committed By: sekiya
Date: Sat Nov 12 11:10:49 UTC 2011
Modified Files:
src/sys/dev/mii: makphy.c miidevs
Log Message:
Add support for makphy 0x0029 variation found on most recent Globalscale
Dreamplug.
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/sys/dev/mii/makphy.c
cvs rdiff -u -r1.103 -r1.104 src/sys/dev/mii/miidevs
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.35 src/sys/dev/mii/makphy.c:1.36
--- src/sys/dev/mii/makphy.c:1.35 Sat Dec 11 18:10:42 2010
+++ src/sys/dev/mii/makphy.c Sat Nov 12 11:10:49 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: makphy.c,v 1.35 2010/12/11 18:10:42 matt Exp $ */
+/* $NetBSD: makphy.c,v 1.36 2011/11/12 11:10:49 sekiya 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.35 2010/12/11 18:10:42 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: makphy.c,v 1.36 2011/11/12 11:10:49 sekiya Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -116,6 +116,9 @@ 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 },
+
{ 0, 0,
NULL },
};
Index: src/sys/dev/mii/miidevs
diff -u src/sys/dev/mii/miidevs:1.103 src/sys/dev/mii/miidevs:1.104
--- src/sys/dev/mii/miidevs:1.103 Wed Nov 2 19:55:57 2011
+++ src/sys/dev/mii/miidevs Sat Nov 12 11:10:49 2011
@@ -1,4 +1,4 @@
-$NetBSD: miidevs,v 1.103 2011/11/02 19:55:57 jakllsch Exp $
+$NetBSD: miidevs,v 1.104 2011/11/12 11:10:49 sekiya Exp $
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -241,6 +241,7 @@ model xxMARVELL E1111 0x000c Marvell 88
model xxMARVELL E1145 0x000d Marvell 88E1145 Quad Gigabit PHY
model xxMARVELL E1116 0x0021 Marvell 88E1116 Gigabit PHY
model xxMARVELL E1116R 0x0024 Marvell 88E1116R Gigabit PHY
+model xxMARVELL E1116R_29 0x0029 Marvell 88E1116R Gigabit PHY
/* Myson Technology PHYs */
model xxMYSON MTD972 0x0000 MTD972 10/100 media interface
