From: kettenis <kettenis@openbsd.org>
Date: Fri, 8 Jul 2016 08:30:06 +0000 (+0000)
Subject: The Atheros PHYs with model ID 7 are the AR8031/AR8033/AR8035 family.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=c665afaef03df68dd1198cacd026851125a89cb1;p=openbsd

The Atheros PHYs with model ID 7 are the AR8031/AR8033/AR8035 family.
Identify as AR8035 since that one has the lowest revision number.

ok mlarkin@, millert@
---

diff --git a/sys/dev/mii/atphy.c b/sys/dev/mii/atphy.c
index 793dda9009d..7d166bae291 100644
--- a/sys/dev/mii/atphy.c
+++ b/sys/dev/mii/atphy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: atphy.c,v 1.9 2015/03/14 03:38:47 jsg Exp $	*/
+/*	$OpenBSD: atphy.c,v 1.10 2016/07/08 08:30:06 kettenis Exp $	*/
 
 /*-
  * Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org>
@@ -84,10 +84,10 @@ const struct mii_phy_funcs atphy_funcs = {
 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 },
+	{ MII_OUI_ATHEROS,	MII_MODEL_ATHEROS_AR8035,
+	  MII_STR_ATHEROS_AR8035 },
 	{ 0,			0,
 	  NULL },
 };
diff --git a/sys/dev/mii/miidevs b/sys/dev/mii/miidevs
index a4f3456f0c3..590d7cfdc39 100644
--- a/sys/dev/mii/miidevs
+++ b/sys/dev/mii/miidevs
@@ -1,4 +1,4 @@
-$OpenBSD: miidevs,v 1.124 2015/07/19 06:30:02 yuo Exp $
+$OpenBSD: miidevs,v 1.125 2016/07/08 08:30:06 kettenis Exp $
 /* $NetBSD: miidevs,v 1.3 1998/11/05 03:43:43 thorpej Exp $ */
 
 /*-
@@ -120,7 +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
+model ATHEROS AR8035		0x0007	AR8035 10/100/1000 PHY
 
 /* Altima PHYs */
 model xxALTIMA AC_UNKNOWN	0x0001	AC_UNKNOWN 10/100 PHY