Module Name: src
Committed By: msaitoh
Date: Fri Mar 13 04:44:34 UTC 2020
Modified Files:
src/sys/dev/mii: atphy.c miidevs
Log Message:
0x001374 is non-bitreversed value of Attansic OUI(0x00c82e).
Attansic/Atheros correctly uses ID1 and ID2 register, so delete all 0x001374
related entries.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/mii/atphy.c
cvs rdiff -u -r1.165 -r1.166 src/sys/dev/mii/miidevs
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/mii/atphy.c
diff -u src/sys/dev/mii/atphy.c:1.27 src/sys/dev/mii/atphy.c:1.28
--- src/sys/dev/mii/atphy.c:1.27 Fri Dec 13 08:30:26 2019
+++ src/sys/dev/mii/atphy.c Fri Mar 13 04:44:34 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: atphy.c,v 1.27 2019/12/13 08:30:26 msaitoh Exp $ */
+/* $NetBSD: atphy.c,v 1.28 2020/03/13 04:44:34 msaitoh Exp $ */
/* $OpenBSD: atphy.c,v 1.1 2008/09/25 20:47:16 brad Exp $ */
/*-
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: atphy.c,v 1.27 2019/12/13 08:30:26 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atphy.c,v 1.28 2020/03/13 04:44:34 msaitoh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -103,7 +103,6 @@ const struct mii_phy_funcs atphy_funcs =
};
static const struct mii_phydesc atphys[] = {
- MII_PHY_DESC(ATHEROS, F1),
MII_PHY_DESC(ATTANSIC, L1),
MII_PHY_DESC(ATTANSIC, L2),
MII_PHY_DESC(ATTANSIC, AR8021),
Index: src/sys/dev/mii/miidevs
diff -u src/sys/dev/mii/miidevs:1.165 src/sys/dev/mii/miidevs:1.166
--- src/sys/dev/mii/miidevs:1.165 Fri Mar 13 04:43:03 2020
+++ src/sys/dev/mii/miidevs Fri Mar 13 04:44:34 2020
@@ -1,4 +1,4 @@
-$NetBSD: miidevs,v 1.165 2020/03/13 04:43:03 msaitoh Exp $
+$NetBSD: miidevs,v 1.166 2020/03/13 04:44:34 msaitoh Exp $
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -66,7 +66,6 @@ oui MICREL 0x0010a1 Micrel
oui ALTIMA 0x0010a9 Altima Communications
oui ENABLESEMI 0x0010dd Enable Semiconductor
oui SUNPLUS 0x001105 Sunplus Technology
-oui ATHEROS 0x001374 Atheros
oui TERANETICS 0x0014a6 Teranetics
oui RALINK2 0x0017a5 Ralink Technology
oui AQUANTIA 0x0017b6 Aquantia Corporation
@@ -150,11 +149,7 @@ model ALTIMA Am79C874 0x0021 Am79C874 1
model AMLOGIC GXL 0x0000 Meson GXL internal PHY
model xxAMLOGIC GXL 0x0000 Meson GXL internal PHY
-/* Atheros PHYs */
-model ATHEROS F1 0x0001 F1 10/100/1000 PHY
-model ATHEROS F2 0x0002 F2 10/100 PHY
-
-/* Attansic PHYs */
+/* Attansic/Atheros PHYs */
model ATTANSIC L1 0x0001 L1 10/100/1000 PHY
model ATTANSIC L2 0x0002 L2 10/100 PHY
model ATTANSIC AR8021 0x0004 Atheros AR8021 10/100/1000 PHY
