summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordwhite <dwhite@FreeBSD.org>2007-01-26 17:05:24 +0000
committerdwhite <dwhite@FreeBSD.org>2007-01-26 17:05:24 +0000
commit308276e932abbce5a6e0a63ca77cb703deef96da (patch)
tree7b6e3f7baa6f206bc3355eb0943791712d23dbb7
parent3c7fc4d94cf691ec33107f3af812cb1d2c361f65 (diff)
downloadFreeBSD-src-308276e932abbce5a6e0a63ca77cb703deef96da.zip
FreeBSD-src-308276e932abbce5a6e0a63ca77cb703deef96da.tar.gz
Collapse 5706C and 5708C PHYs into one entry. ID 0x15 is actually used for
the SERDES PHY on these chips and we want gentbi to pick this up, not brgphy.
-rw-r--r--sys/dev/mii/brgphy.c1
-rw-r--r--sys/dev/mii/miidevs3
2 files changed, 1 insertions, 3 deletions
diff --git a/sys/dev/mii/brgphy.c b/sys/dev/mii/brgphy.c
index 09ff2c0..204fa64 100644
--- a/sys/dev/mii/brgphy.c
+++ b/sys/dev/mii/brgphy.c
@@ -115,7 +115,6 @@ static const struct mii_phydesc brgphys[] = {
MII_PHY_DESC(xxBROADCOM, BCM5704),
MII_PHY_DESC(xxBROADCOM, BCM5705),
MII_PHY_DESC(xxBROADCOM, BCM5706C),
- MII_PHY_DESC(xxBROADCOM, BCM5708C),
MII_PHY_DESC(xxBROADCOM, BCM5714),
MII_PHY_DESC(xxBROADCOM, BCM5750),
MII_PHY_DESC(xxBROADCOM, BCM5752),
diff --git a/sys/dev/mii/miidevs b/sys/dev/mii/miidevs
index ca3fb3f..705f5e8 100644
--- a/sys/dev/mii/miidevs
+++ b/sys/dev/mii/miidevs
@@ -129,8 +129,7 @@ model xxBROADCOM BCM5705 0x001a BCM5705 10/100/1000baseTX PHY
model xxBROADCOM BCM5750 0x0018 BCM5750 10/100/1000baseTX PHY
model xxBROADCOM BCM5714 0x0034 BCM5714 10/100/1000baseTX PHY
model xxBROADCOM BCM5780 0x0035 BCM5780 10/100/1000baseTX PHY
-model xxBROADCOM BCM5706C 0x0015 BCM5706C 10/100/1000baseTX PHY
-model xxBROADCOM BCM5708C 0x0036 BCM5708C 10/100/1000baseTX PHY
+model xxBROADCOM BCM5706C 0x0036 BCM5706C/5708C 10/100/1000baseTX PHY
model xxBROADCOM_ALT1 BCM5787 0x000e BCM5787 10/100/1000baseTX PHY
/* Cicada Semiconductor PHYs (now owned by Vitesse?) */
OpenPOWER on IntegriCloud