summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorBrad Smith <brad@cvs.openbsd.org>2006-10-01 15:17:26 +0000
committerBrad Smith <brad@cvs.openbsd.org>2006-10-01 15:17:26 +0000
commit1fe1ea0248b57eb976187b0bfb99ae33e517ce3f (patch)
tree75db860ca4156406f10d4923de3522538c16b647 /sys/dev
parent284517c720a51c85c09736d80ce158999d83e5a8 (diff)
add a few new Marvell ids.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/mii/eephy.c42
1 files changed, 25 insertions, 17 deletions
diff --git a/sys/dev/mii/eephy.c b/sys/dev/mii/eephy.c
index 0c264a63a95..7c3c61d8909 100644
--- a/sys/dev/mii/eephy.c
+++ b/sys/dev/mii/eephy.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: eephy.c,v 1.29 2006/08/21 03:06:06 brad Exp $ */
+/* $OpenBSD: eephy.c,v 1.30 2006/10/01 15:17:25 brad Exp $ */
/*
* Principal Author: Parag Patel
* Copyright (c) 2001
@@ -78,18 +78,10 @@ const struct mii_phy_funcs eephy_funcs = {
};
static const struct mii_phydesc eephys[] = {
- { MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1000_2,
- MII_STR_xxMARVELL_E1000_2 },
- { MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1000_3,
- MII_STR_xxMARVELL_E1000_3 },
- { MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1000_5,
- MII_STR_xxMARVELL_E1000_5 },
- { MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1111,
- MII_STR_xxMARVELL_E1111 },
- { MII_OUI_MARVELL, MII_MODEL_MARVELL_E1000,
- MII_STR_MARVELL_E1000 },
- { MII_OUI_MARVELL, MII_MODEL_MARVELL_E1011,
- MII_STR_MARVELL_E1011 },
+ { MII_OUI_MARVELL, MII_MODEL_MARVELL_E1000_1,
+ MII_STR_MARVELL_E1000_1 },
+ { MII_OUI_MARVELL, MII_MODEL_MARVELL_E1000_2,
+ MII_STR_MARVELL_E1000_2 },
{ MII_OUI_MARVELL, MII_MODEL_MARVELL_E1000_3,
MII_STR_MARVELL_E1000_3 },
{ MII_OUI_MARVELL, MII_MODEL_MARVELL_E1000_4,
@@ -98,12 +90,28 @@ static const struct mii_phydesc eephys[] = {
MII_STR_MARVELL_E1000_5 },
{ MII_OUI_MARVELL, MII_MODEL_MARVELL_E1000_6,
MII_STR_MARVELL_E1000_6 },
- { MII_OUI_MARVELL, MII_MODEL_MARVELL_E1000_7,
- MII_STR_MARVELL_E1000_7 },
- { MII_OUI_MARVELL, MII_MODEL_MARVELL_E1000_8,
- MII_STR_MARVELL_E1000_8 },
+ { MII_OUI_MARVELL, MII_MODEL_MARVELL_E1000S,
+ MII_STR_MARVELL_E1000S },
+ { MII_OUI_MARVELL, MII_MODEL_MARVELL_E1011,
+ MII_STR_MARVELL_E1011 },
{ MII_OUI_MARVELL, MII_MODEL_MARVELL_E1111,
MII_STR_MARVELL_E1111 },
+ { MII_OUI_MARVELL, MII_MODEL_MARVELL_E1112,
+ MII_STR_MARVELL_E1112 },
+ { MII_OUI_MARVELL, MII_MODEL_MARVELL_E1149,
+ MII_STR_MARVELL_E1149 },
+#if 0
+ { MII_OUI_MARVELL, MII_MODEL_MARVELL_E3082,
+ MII_STR_MARVELL_E3082 },
+#endif
+ { MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1000_7,
+ MII_STR_xxMARVELL_E1000_7 },
+ { MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1000_8,
+ MII_STR_xxMARVELL_E1000_8 },
+ { MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1000_9,
+ MII_STR_xxMARVELL_E1000_9 },
+ { MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1111,
+ MII_STR_xxMARVELL_E1111 },
{ 0, 0,
NULL },