svn commit: r213966 - stable/7/sys/dev/mii

[Marius Strobl]

Author: marius
Date: Sun Oct 17 12:47:07 2010
New Revision: 213966
URL: http://svn.freebsd.org/changeset/base/213966

Log:
  MFC: r182751
  
  Recognize 88E1116R phy variation. This part is found on some embedded devices.
  
  Obtained from:	Semihalf

Modified:
  stable/7/sys/dev/mii/e1000phy.c
  stable/7/sys/dev/mii/miidevs
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/dev/mii/e1000phy.c
==============================================================================
--- stable/7/sys/dev/mii/e1000phy.c	Sun Oct 17 12:43:15 2010	(r213965)
+++ stable/7/sys/dev/mii/e1000phy.c	Sun Oct 17 12:47:07 2010	(r213966)
@@ -109,6 +109,7 @@ static const struct mii_phydesc e1000phy
 	MII_PHY_DESC(MARVELL, E1149),
 	MII_PHY_DESC(MARVELL, E1111),
 	MII_PHY_DESC(MARVELL, E1116),
+	MII_PHY_DESC(MARVELL, E1116R),
 	MII_PHY_DESC(MARVELL, E1118),
 	MII_PHY_DESC(MARVELL, E3016),
 	MII_PHY_DESC(MARVELL, PHYG65G),

Modified: stable/7/sys/dev/mii/miidevs
==============================================================================
--- stable/7/sys/dev/mii/miidevs	Sun Oct 17 12:43:15 2010	(r213965)
+++ stable/7/sys/dev/mii/miidevs	Sun Oct 17 12:47:07 2010	(r213966)
@@ -237,6 +237,7 @@ model MARVELL E1112		0x0009 Marvell 88E1
 model MARVELL E1149		0x000b Marvell 88E1149 Gigabit PHY
 model MARVELL E1111		0x000c Marvell 88E1111 Gigabit PHY
 model MARVELL E1116		0x0021 Marvell 88E1116 Gigabit PHY
+model MARVELL E1116R		0x0024 Marvell 88E1116R Gigabit PHY
 model MARVELL E1118		0x0022 Marvell 88E1118 Gigabit PHY
 model MARVELL E3016		0x0026 Marvell 88E3016 10/100 Fast Ethernet PHY
 model MARVELL PHYG65G		0x0027 Marvell PHYG65G Gigabit PHY