Module Name: src
Committed By: simonb
Date: Sun May 31 04:56:35 UTC 2020
Modified Files:
src/sys/arch/evbmips/cavium: autoconf.c
src/sys/arch/evbmips/conf: ERLITE
src/sys/arch/mips/cavium: octeon1p_iobus.c
src/sys/arch/mips/cavium/dev: octeon_dwctwo.c octeon_gmx.c octeon_mpi.c
octeon_rnm.c octeon_uart.c
src/sys/arch/mips/conf: files.octeon
Log Message:
Clean up Cavium Octeon device names. Rename devices from "octeon_foo"
to "octfoo" - this follows the naming conventions used by many other
MIPS CPUs.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbmips/cavium/autoconf.c
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/evbmips/conf/ERLITE
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/mips/cavium/octeon1p_iobus.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/mips/cavium/dev/octeon_dwctwo.c \
src/sys/arch/mips/cavium/dev/octeon_gmx.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/mips/cavium/dev/octeon_mpi.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/mips/cavium/dev/octeon_rnm.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/mips/cavium/dev/octeon_uart.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/mips/conf/files.octeon
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbmips/cavium/autoconf.c
diff -u src/sys/arch/evbmips/cavium/autoconf.c:1.4 src/sys/arch/evbmips/cavium/autoconf.c:1.5
--- src/sys/arch/evbmips/cavium/autoconf.c:1.4 Mon Apr 1 06:12:51 2019
+++ src/sys/arch/evbmips/cavium/autoconf.c Sun May 31 04:56:35 2020
@@ -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 @@ device_register(device_t dev, void *aux)
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);
}
}
Index: src/sys/arch/evbmips/conf/ERLITE
diff -u src/sys/arch/evbmips/conf/ERLITE:1.24 src/sys/arch/evbmips/conf/ERLITE:1.25
--- src/sys/arch/evbmips/conf/ERLITE:1.24 Sun Jan 19 01:25:05 2020
+++ src/sys/arch/evbmips/conf/ERLITE Sun May 31 04:56:35 2020
@@ -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 @@ bootbus0 at mainbus?
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?
Index: src/sys/arch/mips/cavium/octeon1p_iobus.c
diff -u src/sys/arch/mips/cavium/octeon1p_iobus.c:1.2 src/sys/arch/mips/cavium/octeon1p_iobus.c:1.3
--- src/sys/arch/mips/cavium/octeon1p_iobus.c:1.2 Fri May 1 07:23:47 2015
+++ src/sys/arch/mips/cavium/octeon1p_iobus.c Sun May 31 04:56:35 2020
@@ -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_unit iobus_uni
};
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_unit iobus_uni
};
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_unit iobus_uni
};
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_unit iobus_uni
};
static const struct iobus_dev iobus_dev_octeon_gmx = {
- .name = "octeon_gmx",
+ .name = "octgmx",
.nunits = GMX_IF_NUNITS,
.units = iobus_units_octeon_gmx
};
Index: src/sys/arch/mips/cavium/dev/octeon_dwctwo.c
diff -u src/sys/arch/mips/cavium/dev/octeon_dwctwo.c:1.9 src/sys/arch/mips/cavium/dev/octeon_dwctwo.c:1.10
--- src/sys/arch/mips/cavium/dev/octeon_dwctwo.c:1.9 Tue Jul 12 03:34:25 2016
+++ src/sys/arch/mips/cavium/dev/octeon_dwctwo.c Sun May 31 04:56:35 2020
@@ -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 <[email protected]>
@@ -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 @@ static struct dwc2_core_params octeon_dw
.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
Index: src/sys/arch/mips/cavium/dev/octeon_gmx.c
diff -u src/sys/arch/mips/cavium/dev/octeon_gmx.c:1.9 src/sys/arch/mips/cavium/dev/octeon_gmx.c:1.10
--- src/sys/arch/mips/cavium/dev/octeon_gmx.c:1.9 Fri Apr 24 09:29:26 2020
+++ src/sys/arch/mips/cavium/dev/octeon_gmx.c Sun May 31 04:56:35 2020
@@ -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 @@ EVCNT_ATTACH_STATIC(octeon_gmx_intr_evcn
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 @@ octeon_gmx_attach(device_t parent, devic
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
Index: src/sys/arch/mips/cavium/dev/octeon_mpi.c
diff -u src/sys/arch/mips/cavium/dev/octeon_mpi.c:1.2 src/sys/arch/mips/cavium/dev/octeon_mpi.c:1.3
--- src/sys/arch/mips/cavium/dev/octeon_mpi.c:1.2 Mon Jun 1 22:55:12 2015
+++ src/sys/arch/mips/cavium/dev/octeon_mpi.c Sun May 31 04:56:35 2020
@@ -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 @@ octeon_mpi_attach(device_t parent, devic
#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
Index: src/sys/arch/mips/cavium/dev/octeon_rnm.c
diff -u src/sys/arch/mips/cavium/dev/octeon_rnm.c:1.7 src/sys/arch/mips/cavium/dev/octeon_rnm.c:1.8
--- src/sys/arch/mips/cavium/dev/octeon_rnm.c:1.7 Sat May 30 03:12:52 2020
+++ src/sys/arch/mips/cavium/dev/octeon_rnm.c Sun May 31 04:56:35 2020
@@ -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 uint64_t octeon_rnm_load(struct o
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
Index: src/sys/arch/mips/cavium/dev/octeon_uart.c
diff -u src/sys/arch/mips/cavium/dev/octeon_uart.c:1.3 src/sys/arch/mips/cavium/dev/octeon_uart.c:1.4
--- src/sys/arch/mips/cavium/dev/octeon_uart.c:1.3 Tue Jun 2 05:11:34 2015
+++ src/sys/arch/mips/cavium/dev/octeon_uart.c Sun May 31 04:56:35 2020
@@ -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 @@ const struct com_regs octeon_uart_com_re
}
};
-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
Index: src/sys/arch/mips/conf/files.octeon
diff -u src/sys/arch/mips/conf/files.octeon:1.4 src/sys/arch/mips/conf/files.octeon:1.5
--- src/sys/arch/mips/conf/files.octeon:1.4 Sat Jun 6 04:34:23 2015
+++ src/sys/arch/mips/conf/files.octeon Sun May 31 04:56:35 2020
@@ -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 @@ file arch/mips/cavium/dev/octeon_smi.c i
# 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 octeon_twsi: i2cbus
-attach octeon_twsi at iobus
-file arch/mips/cavium/dev/octeon_twsi.c octeon_twsi
-
-device octeon_mpi {}
-attach octeon_mpi at iobus
-file arch/mips/cavium/dev/octeon_mpi.c octeon_mpi
-
-device octeon_gmx {}
-attach octeon_gmx at iobus
-file arch/mips/cavium/dev/octeon_gmx.c octeon_gmx
+device octrnm
+attach octrnm at iobus
+file arch/mips/cavium/dev/octeon_rnm.c octrnm & rnd
+
+device octtwsi: i2cbus
+attach octtwsi at iobus
+file arch/mips/cavium/dev/octeon_twsi.c octtwsi
+
+device octmpi {}
+attach octmpi at iobus
+file arch/mips/cavium/dev/octeon_mpi.c octmpi
+
+device octgmx {}
+attach octgmx at iobus
+file arch/mips/cavium/dev/octeon_gmx.c octgmx
# On-chip ethernet device(s)
device cnmac: ether, ifnet, arp, mii
-attach cnmac at octeon_gmx
+attach cnmac at octgmx
file arch/mips/cavium/dev/if_cnmac.c cnmac
-attach dwctwo at iobus with octeon_dwctwo
-file arch/mips/cavium/dev/octeon_dwctwo.c octeon_dwctwo
+attach dwctwo at iobus with octdwctwo
+file arch/mips/cavium/dev/octeon_dwctwo.c octdwctwo
# Boot-Bus
