diff options
| author | Kevin Lo <kevlo@cvs.openbsd.org> | 2011-01-21 09:46:14 +0000 |
|---|---|---|
| committer | Kevin Lo <kevlo@cvs.openbsd.org> | 2011-01-21 09:46:14 +0000 |
| commit | c8304584478675813187611d161166b3725f1533 (patch) | |
| tree | 66a2d5ef2dd44a2af375c913078c6f821b85fff2 /sys/dev/mii | |
| parent | 618e036ccd124171da16f4ebfb436fd95d9954ea (diff) | |
Add Atheros F1 and F2 PHYs from FreeBSD
ok jsg@
Diffstat (limited to 'sys/dev/mii')
| -rw-r--r-- | sys/dev/mii/atphy.c | 12 | ||||
| -rw-r--r-- | sys/dev/mii/miidevs | 3 |
2 files changed, 10 insertions, 5 deletions
diff --git a/sys/dev/mii/atphy.c b/sys/dev/mii/atphy.c index d1fc645391d..b3bde12268d 100644 --- a/sys/dev/mii/atphy.c +++ b/sys/dev/mii/atphy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: atphy.c,v 1.4 2009/07/25 12:23:40 martynas Exp $ */ +/* $OpenBSD: atphy.c,v 1.5 2011/01/21 09:46:13 kevlo Exp $ */ /*- * Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org> @@ -81,9 +81,13 @@ const struct mii_phy_funcs atphy_funcs = { atphy_service, atphy_status, atphy_reset, }; -static const struct mii_phydesc etphys[] = { +static const struct mii_phydesc atphys[] = { { MII_OUI_ATHEROS, MII_MODEL_ATHEROS_F1, MII_STR_ATHEROS_F1 }, + { MII_OUI_ATHEROS, MII_MODEL_ATHEROS_F1_7, + MII_STR_ATHEROS_F1_7 }, + { MII_OUI_ATHEROS, MII_MODEL_ATHEROS_F2, + MII_STR_ATHEROS_F2 }, { 0, 0, NULL }, }; @@ -102,7 +106,7 @@ atphy_match(struct device *parent, void *match, void *aux) { struct mii_attach_args *ma = aux; - if (mii_phy_match(ma, etphys) != NULL) + if (mii_phy_match(ma, atphys) != NULL) return (10); return (0); @@ -116,7 +120,7 @@ atphy_attach(struct device *parent, struct device *self, void *aux) struct mii_data *mii = ma->mii_data; const struct mii_phydesc *mpd; - mpd = mii_phy_match(ma, etphys); + mpd = mii_phy_match(ma, atphys); printf(": %s, rev. %d\n", mpd->mpd_name, MII_REV(ma->mii_id2)); sc->mii_inst = mii->mii_instance; diff --git a/sys/dev/mii/miidevs b/sys/dev/mii/miidevs index 52e24ae7147..bf37b5aeb46 100644 --- a/sys/dev/mii/miidevs +++ b/sys/dev/mii/miidevs @@ -1,4 +1,4 @@ -$OpenBSD: miidevs,v 1.115 2011/01/15 04:35:34 kevlo Exp $ +$OpenBSD: miidevs,v 1.116 2011/01/21 09:46:13 kevlo Exp $ /* $NetBSD: miidevs,v 1.3 1998/11/05 03:43:43 thorpej Exp $ */ /*- @@ -120,6 +120,7 @@ model AGERE ET1011 0x0004 ET1011 10/100/1000baseT PHY /* Atheros PHYs */ model ATHEROS F1 0x0001 F1 10/100/1000 PHY model ATHEROS F2 0x0002 F2 10/100 PHY +model ATHEROS F1_7 0x0007 F1 10/100/1000 PHY /* Altima PHYs */ model xxALTIMA AC_UNKNOWN 0x0001 AC_UNKNOWN 10/100 PHY |