[src/netbsd-9]: src/sys/dev/mii Pull up following revision(s) (requested by m...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b85cf781530e
branches:  netbsd-9
changeset: 461409:b85cf781530e
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Nov 25 16:26:00 2019 +0000

description:
Pull up following revision(s) (requested by msaitoh in ticket #473):

        sys/dev/mii/rlphy.c: revision 1.37
        sys/dev/mii/miidevs: revision 1.155
        sys/dev/mii/miidevs: revision 1.156
        sys/dev/mii/miidevs: revision 1.157
        sys/dev/mii/miidevs: revision 1.159
        sys/dev/mii/miidevs: revision 1.160

 Add Teranetics, Aquantia and Renesas.

 Use uppercase for vendor name.

 Change ICPLUS(0x0090c3) to xxICPLUS(0x0009c3)
- ICPLUS -> xxICPLUS
- Print model name if it's ICPLUS IP101 to avoid "Realtek internal PHY".

Fix typo. from vezhlys
- Rename JMICRON 0x0021 from JMC250 to JMP211
- Rename JMICRON 0x0022 from JMC260 to JMP202

diffstat:

 sys/dev/mii/miidevs |  21 ++++++++++++---------
 sys/dev/mii/rlphy.c |   9 ++++++---
 2 files changed, 18 insertions(+), 12 deletions(-)

diffs (109 lines):

diff -r 8a723b967309 -r b85cf781530e sys/dev/mii/miidevs
--- a/sys/dev/mii/miidevs       Mon Nov 25 16:20:41 2019 +0000
+++ b/sys/dev/mii/miidevs       Mon Nov 25 16:26:00 2019 +0000
@@ -1,4 +1,4 @@
-$NetBSD: miidevs,v 1.153.2.2 2019/10/23 19:45:56 martin Exp $
+$NetBSD: miidevs,v 1.153.2.3 2019/11/25 16:26:00 martin Exp $
 
 /*-
  * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -65,7 +65,9 @@
 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
 oui BROADCOM3                  0x001be9        Broadcom Corporation
 oui LEVEL1                     0x00207b        Level 1
 oui VIA                                0x004063        VIA Technologies
@@ -74,7 +76,6 @@
 oui AMLOGIC                    0x006051        Amlogic
 oui DAVICOM                    0x00606e        Davicom Semiconductor
 oui SMSC                       0x00800f        SMSC
-oui ICPLUS                     0x0090c3        IC Plus Corp.
 oui SEEQ                       0x00a07d        Seeq
 oui ICS                                0x00a0be        Integrated Circuit Systems
 oui INTEL                      0x00aa00        Intel
@@ -91,8 +92,9 @@
 oui NATSEMI                    0x080017        National Semiconductor
 oui TI                         0x080028        Texas Instruments
 oui BROADCOM4                  0x18c086        Broadcom Corporation
+oui RENESAS                    0x749050        Renesas
 
-/* Unregisterd or wrong OUI */
+/* Unregistered or wrong OUI */
 oui yyREALTEK                  0x000004        Realtek
 oui yyAMD                      0x000058        Advanced Micro Devices
 oui xxMYSON                    0x00032d        Myson Technology
@@ -104,6 +106,7 @@
 oui xxREALTEK                  0x000732        Realtek
 oui xxBROADCOM                 0x000818        Broadcom Corporation
 oui xxPMCSIERRA                        0x0009c0        PMC-Sierra
+oui xxICPLUS                   0x0009c3        IC Plus Corp.
 oui xxMARVELL                  0x000ac2        Marvell Semiconductor
 oui xxINTEL                    0x001f00        Intel
 oui xxBROADCOM_ALT1            0x0050ef        Broadcom Corporation
@@ -242,10 +245,10 @@
 model xxDAVICOM DM9601         0x000c DM9601 internal 10/100 media interface
 
 /* IC Plus Corp. PHYs */
-model ICPLUS IP100             0x0004 IP100 10/100 PHY
-model ICPLUS IP101             0x0005 IP101 10/100 PHY
-model ICPLUS IP1000A           0x0008 IP1000A 10/100/1000 PHY
-model ICPLUS IP1001            0x0019 IP1001 10/100/1000 PHY
+model xxICPLUS IP100           0x0004 IP100 10/100 PHY
+model xxICPLUS IP101           0x0005 IP101 10/100 PHY
+model xxICPLUS IP1000A         0x0008 IP1000A 10/100/1000 PHY
+model xxICPLUS IP1001          0x0019 IP1001 10/100/1000 PHY
 
 /* Integrated Circuit Systems PHYs */
 model ICS 1889                 0x0001 ICS1889 10/100 media interface
@@ -278,8 +281,8 @@
 
 
 /* JMicron PHYs */
-model JMICRON JMC250           0x0021 JMC250 10/100/1000 media interface
-model JMICRON JMC260           0x0022 JMC260 10/100 media interface
+model JMICRON JMP211           0x0021 JMP211 10/100/1000 media interface
+model JMICRON JMP202           0x0022 JMP202 10/100 media interface
 
 /* Level 1 PHYs */
 model xxLEVEL1 LXT970          0x0000 LXT970 10/100 media interface
diff -r 8a723b967309 -r b85cf781530e sys/dev/mii/rlphy.c
--- a/sys/dev/mii/rlphy.c       Mon Nov 25 16:20:41 2019 +0000
+++ b/sys/dev/mii/rlphy.c       Mon Nov 25 16:26:00 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rlphy.c,v 1.36 2019/03/25 09:20:46 msaitoh Exp $       */
+/*     $NetBSD: rlphy.c,v 1.36.4.1 2019/11/25 16:26:00 martin Exp $    */
 /*     $OpenBSD: rlphy.c,v 1.20 2005/07/31 05:27:30 pvalchev Exp $     */
 
 /*
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rlphy.c,v 1.36 2019/03/25 09:20:46 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rlphy.c,v 1.36.4.1 2019/11/25 16:26:00 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -78,7 +78,7 @@
 static const struct mii_phydesc rlphys[] = {
        MII_PHY_DESC(yyREALTEK, RTL8201L),
        MII_PHY_DESC(REALTEK, RTL8201E),
-       MII_PHY_DESC(ICPLUS, IP101),
+       MII_PHY_DESC(xxICPLUS, IP101),
        MII_PHY_END,
 };
 
@@ -125,6 +125,9 @@
                rsc->sc_rtl8201 = 1;
                aprint_normal(": %s, rev. %d\n", MII_STR_REALTEK_RTL8201E,
                    MII_REV(ma->mii_id2));
+       } else if (MII_MODEL(ma->mii_id2) == MII_MODEL_xxICPLUS_IP101) {
+               aprint_normal(": %s, rev. %d\n", MII_STR_xxICPLUS_IP101,
+                   MII_REV(ma->mii_id2));
        } else
                aprint_normal(": Realtek internal PHY\n");