svn commit: r232137 - in stable/9/sys: dev/mii i386/conf

[Marius Strobl]

Author: marius
Date: Sat Feb 25 00:41:35 2012
New Revision: 232137
URL: http://svn.freebsd.org/changeset/base/232137

Log:
  MFC: r231914
  
  Probe the National DP83849, which is a dual-port version of the PHYTER.
  
  Obtained from:	NetBSD

Modified:
  stable/9/sys/dev/mii/miidevs
  stable/9/sys/dev/mii/nsphyter.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/amd64/include/xen/   (props changed)
  stable/9/sys/boot/   (props changed)
  stable/9/sys/boot/i386/efi/   (props changed)
  stable/9/sys/boot/ia64/efi/   (props changed)
  stable/9/sys/boot/ia64/ski/   (props changed)
  stable/9/sys/boot/powerpc/boot1.chrp/   (props changed)
  stable/9/sys/boot/powerpc/ofw/   (props changed)
  stable/9/sys/cddl/contrib/opensolaris/   (props changed)
  stable/9/sys/conf/   (props changed)
  stable/9/sys/contrib/dev/acpica/   (props changed)
  stable/9/sys/contrib/octeon-sdk/   (props changed)
  stable/9/sys/contrib/pf/   (props changed)
  stable/9/sys/contrib/x86emu/   (props changed)
  stable/9/sys/i386/conf/XENHVM   (props changed)

Modified: stable/9/sys/dev/mii/miidevs
==============================================================================
--- stable/9/sys/dev/mii/miidevs	Sat Feb 25 00:35:32 2012	(r232136)
+++ stable/9/sys/dev/mii/miidevs	Sat Feb 25 00:41:35 2012	(r232137)
@@ -1,5 +1,5 @@
 $FreeBSD$
-/*$NetBSD: miidevs,v 1.104 2011/11/12 11:10:49 sekiya Exp $*/
+/*$NetBSD: miidevs,v 1.105 2011/11/25 23:28:14 jakllsch Exp $*/
 
 /*-
  * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -280,6 +280,7 @@ model xxNATSEMI DP83847		0x0003 DP83847 
 model xxNATSEMI DP83891		0x0005 DP83891 1000BASE-T media interface
 model xxNATSEMI DP83861		0x0006 DP83861 1000BASE-T media interface
 model xxNATSEMI DP83865		0x0007 DP83865 1000BASE-T media interface
+model xxNATSEMI DP83849		0x000a DP83849 10/100 media interface
 
 /* PMC Sierra PHYs */
 model xxPMCSIERRA PM8351	0x0000 PM8351 OctalPHY Gigabit interface

Modified: stable/9/sys/dev/mii/nsphyter.c
==============================================================================
--- stable/9/sys/dev/mii/nsphyter.c	Sat Feb 25 00:35:32 2012	(r232136)
+++ stable/9/sys/dev/mii/nsphyter.c	Sat Feb 25 00:41:35 2012	(r232137)
@@ -58,8 +58,9 @@
 __FBSDID("$FreeBSD$");
 
 /*
- * driver for National Semiconductor's DP83843 `PHYTER' ethernet 10/100 PHY
- * Data Sheet available from www.national.com
+ * Driver for the National Semiconductor's DP83843, DP83847 and DP83849
+ * `PHYTER' Ethernet 10/100 PHYs
+ * Data Sheets are available from http://www.national.com
  *
  * We also support the DP83815 `MacPHYTER' internal PHY since, for our
  * purposes, they are compatible.
@@ -114,6 +115,7 @@ static const struct mii_phydesc nsphyter
 	MII_PHY_DESC(xxNATSEMI, DP83815),
 	MII_PHY_DESC(xxNATSEMI, DP83843),
 	MII_PHY_DESC(xxNATSEMI, DP83847),
+	MII_PHY_DESC(xxNATSEMI, DP83849),
 	MII_PHY_END
 };