[src/trunk]: src/sys/arch Clean up Cavium Octeon device names. Rename device...

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

details:   https://anonhg.NetBSD.org/src/rev/0514a160ccd9
branches:  trunk
changeset: 1010631:0514a160ccd9
user:      simonb <simonb%NetBSD.org@localhost>
date:      Sun May 31 04:56:35 2020 +0000

description:
Clean up Cavium Octeon device names.  Rename devices from "octeon_foo"
to "octfoo" - this follows the naming conventions used by many other
MIPS CPUs.

diffstat:

 sys/arch/evbmips/cavium/autoconf.c       |   6 ++--
 sys/arch/evbmips/conf/ERLITE             |  10 ++++----
 sys/arch/mips/cavium/dev/octeon_dwctwo.c |   6 ++--
 sys/arch/mips/cavium/dev/octeon_gmx.c    |   8 +++---
 sys/arch/mips/cavium/dev/octeon_mpi.c    |   6 ++--
 sys/arch/mips/cavium/dev/octeon_rnm.c    |   6 ++--
 sys/arch/mips/cavium/dev/octeon_uart.c   |   6 ++--
 sys/arch/mips/cavium/octeon1p_iobus.c    |  12 +++++-----
 sys/arch/mips/conf/files.octeon          |  36 ++++++++++++++++----------------
 9 files changed, 48 insertions(+), 48 deletions(-)

diffs (truncated from 316 to 300 lines):

diff -r 6ae1c78554ff -r 0514a160ccd9 sys/arch/evbmips/cavium/autoconf.c
--- a/sys/arch/evbmips/cavium/autoconf.c        Sun May 31 01:39:33 2020 +0000
+++ b/sys/arch/evbmips/cavium/autoconf.c        Sun May 31 04:56:35 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: autoconf.c,v 1.4 2019/04/01 06:12:51 msaitoh Exp $     */
+/*     $NetBSD: autoconf.c,v 1.5 2020/05/31 04:56:35 simonb Exp $      */
 
 /*
  * Copyright 2002 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.4 2019/04/01 06:12:51 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.5 2020/05/31 04:56:35 simonb Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -180,7 +180,7 @@
 
        if (device_is_a(dev, "cnmac")) {
                prop_set_cnmac(dev);
-       } else if (device_is_a(dev, "octeon_gmx")) {
+       } else if (device_is_a(dev, "octgmx")) {
                prop_set_octeon_gmx(dev);
        }
 }
diff -r 6ae1c78554ff -r 0514a160ccd9 sys/arch/evbmips/conf/ERLITE
--- a/sys/arch/evbmips/conf/ERLITE      Sun May 31 01:39:33 2020 +0000
+++ b/sys/arch/evbmips/conf/ERLITE      Sun May 31 04:56:35 2020 +0000
@@ -1,11 +1,11 @@
-#      $NetBSD: ERLITE,v 1.24 2020/01/19 01:25:05 thorpej Exp $
+#      $NetBSD: ERLITE,v 1.25 2020/05/31 04:56:35 simonb Exp $
 
 include        "arch/mips/conf/std.octeon"
 include        "arch/evbmips/conf/files.octeon"
 
 #options       INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "ERLITE-$Revision: 1.24 $"
+#ident                 "ERLITE-$Revision: 1.25 $"
 
 maxusers       32
 
@@ -120,10 +120,10 @@
 
 com*           at iobus?
 
-octeon_rnm*    at iobus?
+octrnm*                at iobus?
 
-octeon_gmx*    at iobus?
-cnmac*         at octeon_gmx?
+octgmx*                at iobus?
+cnmac*         at octgmx?
 
 dwctwo*                at iobus?
 usb*           at dwctwo?
diff -r 6ae1c78554ff -r 0514a160ccd9 sys/arch/mips/cavium/dev/octeon_dwctwo.c
--- a/sys/arch/mips/cavium/dev/octeon_dwctwo.c  Sun May 31 01:39:33 2020 +0000
+++ b/sys/arch/mips/cavium/dev/octeon_dwctwo.c  Sun May 31 04:56:35 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: octeon_dwctwo.c,v 1.9 2016/07/12 03:34:25 matt Exp $   */
+/*     $NetBSD: octeon_dwctwo.c,v 1.10 2020/05/31 04:56:35 simonb Exp $        */
 
 /*
  * Copyright (c) 2015 Masao Uebayashi <uebayasi%tombiinc.com@localhost>
@@ -43,7 +43,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: octeon_dwctwo.c,v 1.9 2016/07/12 03:34:25 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: octeon_dwctwo.c,v 1.10 2020/05/31 04:56:35 simonb Exp $");
 
 #include "opt_octeon.h"
 #include "opt_usb.h"
@@ -139,7 +139,7 @@
        .hibernation                    = -1,
 };
 
-CFATTACH_DECL_NEW(octeon_dwctwo, sizeof(struct octeon_dwc2_softc),
+CFATTACH_DECL_NEW(octdwctwo, sizeof(struct octeon_dwc2_softc),
     octeon_dwc2_match, octeon_dwc2_attach, NULL, NULL);
 
 static int
diff -r 6ae1c78554ff -r 0514a160ccd9 sys/arch/mips/cavium/dev/octeon_gmx.c
--- a/sys/arch/mips/cavium/dev/octeon_gmx.c     Sun May 31 01:39:33 2020 +0000
+++ b/sys/arch/mips/cavium/dev/octeon_gmx.c     Sun May 31 04:56:35 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: octeon_gmx.c,v 1.9 2020/04/24 09:29:26 mrg Exp $       */
+/*     $NetBSD: octeon_gmx.c,v 1.10 2020/05/31 04:56:35 simonb Exp $   */
 
 /*
  * Copyright (c) 2007 Internet Initiative Japan, Inc.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: octeon_gmx.c,v 1.9 2020/04/24 09:29:26 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: octeon_gmx.c,v 1.10 2020/05/31 04:56:35 simonb Exp $");
 
 #include "opt_octeon.h"
 
@@ -168,7 +168,7 @@
 struct octeon_gmx_port_softc *__octeon_gmx_port_softc[3/* XXX */];
 #endif
 
-CFATTACH_DECL_NEW(octeon_gmx, sizeof(struct octeon_gmx_softc),
+CFATTACH_DECL_NEW(octgmx, sizeof(struct octeon_gmx_softc),
     octeon_gmx_match, octeon_gmx_attach, NULL, NULL);
 
 static int
@@ -229,7 +229,7 @@
                gmx_aa.ga_port_type = sc->sc_port_types[i];
                gmx_aa.ga_gmx = sc;
                gmx_aa.ga_gmx_port = port_sc;
-               config_found_sm_loc(self, "octeon_gmx", NULL, &gmx_aa,
+               config_found_sm_loc(self, "octgmx", NULL, &gmx_aa,
                    octeon_gmx_print, octeon_gmx_submatch);
 
 #ifdef OCTEON_ETH_DEBUG
diff -r 6ae1c78554ff -r 0514a160ccd9 sys/arch/mips/cavium/dev/octeon_mpi.c
--- a/sys/arch/mips/cavium/dev/octeon_mpi.c     Sun May 31 01:39:33 2020 +0000
+++ b/sys/arch/mips/cavium/dev/octeon_mpi.c     Sun May 31 04:56:35 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: octeon_mpi.c,v 1.2 2015/06/01 22:55:12 matt Exp $      */
+/*     $NetBSD: octeon_mpi.c,v 1.3 2020/05/31 04:56:35 simonb Exp $    */
 
 /*
  * Copyright (c) 2007 Internet Initiative Japan, Inc.
@@ -28,7 +28,7 @@
 
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: octeon_mpi.c,v 1.2 2015/06/01 22:55:12 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: octeon_mpi.c,v 1.3 2020/05/31 04:56:35 simonb Exp $");
 
 #include "opt_octeon.h"
 
@@ -155,7 +155,7 @@
 #endif
        octeon_mpi_reg_wr(sc, MPI_TX_OFFSET, 0);
 
-       config_found_ia(&sc->sc_dev, "octeon_mpi", &pa, spi_print);
+       config_found_ia(&sc->sc_dev, "octmpi", &pa, spi_print);
 }
 
 #if 0
diff -r 6ae1c78554ff -r 0514a160ccd9 sys/arch/mips/cavium/dev/octeon_rnm.c
--- a/sys/arch/mips/cavium/dev/octeon_rnm.c     Sun May 31 01:39:33 2020 +0000
+++ b/sys/arch/mips/cavium/dev/octeon_rnm.c     Sun May 31 04:56:35 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: octeon_rnm.c,v 1.7 2020/05/30 03:12:52 simonb Exp $    */
+/*     $NetBSD: octeon_rnm.c,v 1.8 2020/05/31 04:56:35 simonb Exp $    */
 
 /*
  * Copyright (c) 2007 Internet Initiative Japan, Inc.
@@ -99,7 +99,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: octeon_rnm.c,v 1.7 2020/05/30 03:12:52 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: octeon_rnm.c,v 1.8 2020/05/31 04:56:35 simonb Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -142,7 +142,7 @@
 static void octeon_rnm_iobdma(struct octeon_rnm_softc *, uint64_t *, unsigned);
 static void octeon_rnm_delay(uint32_t);
 
-CFATTACH_DECL_NEW(octeon_rnm, sizeof(struct octeon_rnm_softc),
+CFATTACH_DECL_NEW(octrnm, sizeof(struct octeon_rnm_softc),
     octeon_rnm_match, octeon_rnm_attach, NULL, NULL);
 
 static int
diff -r 6ae1c78554ff -r 0514a160ccd9 sys/arch/mips/cavium/dev/octeon_uart.c
--- a/sys/arch/mips/cavium/dev/octeon_uart.c    Sun May 31 01:39:33 2020 +0000
+++ b/sys/arch/mips/cavium/dev/octeon_uart.c    Sun May 31 04:56:35 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: octeon_uart.c,v 1.3 2015/06/02 05:11:34 matt Exp $     */
+/*     $NetBSD: octeon_uart.c,v 1.4 2020/05/31 04:56:35 simonb Exp $   */
 
 /*
  * Copyright (c) 2007 Internet Initiative Japan, Inc.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: octeon_uart.c,v 1.3 2015/06/02 05:11:34 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: octeon_uart.c,v 1.4 2020/05/31 04:56:35 simonb Exp $");
 
 #include "opt_octeon.h"
 
@@ -93,7 +93,7 @@
        }
 };
 
-CFATTACH_DECL_NEW(octeon_uart_iobus, sizeof(struct octeon_uart_iobus_softc),
+CFATTACH_DECL_NEW(com_iobus, sizeof(struct octeon_uart_iobus_softc),
     octeon_uart_iobus_match, octeon_uart_iobus_attach, NULL, NULL);
 
 int
diff -r 6ae1c78554ff -r 0514a160ccd9 sys/arch/mips/cavium/octeon1p_iobus.c
--- a/sys/arch/mips/cavium/octeon1p_iobus.c     Sun May 31 01:39:33 2020 +0000
+++ b/sys/arch/mips/cavium/octeon1p_iobus.c     Sun May 31 04:56:35 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: octeon1p_iobus.c,v 1.2 2015/05/01 07:23:47 hikaru Exp $        */
+/*     $NetBSD: octeon1p_iobus.c,v 1.3 2020/05/31 04:56:35 simonb Exp $        */
 
 /*
  * Copyright (c) 2007 Internet Initiative Japan, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: octeon1p_iobus.c,v 1.2 2015/05/01 07:23:47 hikaru Exp $");
+__KERNEL_RCSID(0, "$NetBSD: octeon1p_iobus.c,v 1.3 2020/05/31 04:56:35 simonb Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -68,7 +68,7 @@
 };
 
 static const struct iobus_dev iobus_dev_octeon_rnm = {
-       .name = "octeon_rnm",
+       .name = "octrnm",
        .nunits = RNM_NUNITS,
        .units = iobus_units_octeon_rnm
 };
@@ -83,7 +83,7 @@
 };
 
 static const struct iobus_dev iobus_dev_octeon_twsi = {
-       .name = "octeon_twsi",
+       .name = "octtwsi",
        .nunits = MIO_TWS_NUNITS,
        .units = iobus_units_octeon_twsi
 };
@@ -98,7 +98,7 @@
 };
 
 static const struct iobus_dev iobus_dev_octeon_mpi = {
-       .name = "octeon_mpi",
+       .name = "octmpi",
        .nunits = MPI_NUNITS,
        .units = iobus_units_octeon_mpi
 };
@@ -112,7 +112,7 @@
 };
 
 static const struct iobus_dev iobus_dev_octeon_gmx = {
-       .name = "octeon_gmx",
+       .name = "octgmx",
        .nunits = GMX_IF_NUNITS,
        .units = iobus_units_octeon_gmx
 };
diff -r 6ae1c78554ff -r 0514a160ccd9 sys/arch/mips/conf/files.octeon
--- a/sys/arch/mips/conf/files.octeon   Sun May 31 01:39:33 2020 +0000
+++ b/sys/arch/mips/conf/files.octeon   Sun May 31 04:56:35 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.octeon,v 1.4 2015/06/06 04:34:23 matt Exp $
+#      $NetBSD: files.octeon,v 1.5 2020/05/31 04:56:35 simonb Exp $
 
 file   arch/mips/mips/locore_octeon.S
 file   arch/mips/mips/bus_dma.c
@@ -51,33 +51,33 @@
 
 # I/O Bus devices
 
-attach com at iobus with octeon_uart_iobus
-file   arch/mips/cavium/dev/octeon_uart.c      octeon_uart_iobus
+attach com at iobus with com_iobus
+file   arch/mips/cavium/dev/octeon_uart.c      com_iobus
 options        COM_REGMAP
 
-device octeon_rnm
-attach octeon_rnm at iobus
-file   arch/mips/cavium/dev/octeon_rnm.c       octeon_rnm & rnd
+device octrnm
+attach octrnm at iobus
+file   arch/mips/cavium/dev/octeon_rnm.c       octrnm & rnd
 
-device octeon_twsi: i2cbus
-attach octeon_twsi at iobus
-file   arch/mips/cavium/dev/octeon_twsi.c      octeon_twsi
+device octtwsi: i2cbus
+attach octtwsi at iobus
+file   arch/mips/cavium/dev/octeon_twsi.c      octtwsi
 
-device octeon_mpi {}
-attach octeon_mpi at iobus
-file   arch/mips/cavium/dev/octeon_mpi.c       octeon_mpi
+device octmpi {}
+attach octmpi at iobus
+file   arch/mips/cavium/dev/octeon_mpi.c       octmpi
 
-device octeon_gmx {}
-attach octeon_gmx at iobus
-file   arch/mips/cavium/dev/octeon_gmx.c       octeon_gmx
+device octgmx {}