Module Name: src
Committed By: simonb
Date: Wed Jun 24 12:43:40 UTC 2020
Modified Files:
src/sys/arch/mips/conf: files.octeon
Log Message:
Redo cnmac attachments - cnmacM @ gmxN @ pip0 @ iobus
Missed one file - thanks martin@.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 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/mips/conf/files.octeon
diff -u src/sys/arch/mips/conf/files.octeon:1.8 src/sys/arch/mips/conf/files.octeon:1.9
--- src/sys/arch/mips/conf/files.octeon:1.8 Mon Jun 22 02:26:20 2020
+++ src/sys/arch/mips/conf/files.octeon Wed Jun 24 12:43:40 2020
@@ -1,4 +1,4 @@
-# $NetBSD: files.octeon,v 1.8 2020/06/22 02:26:20 simonb Exp $
+# $NetBSD: files.octeon,v 1.9 2020/06/24 12:43:40 simonb Exp $
file arch/mips/mips/locore_octeon.S
file arch/mips/mips/bus_dma.c
@@ -8,15 +8,6 @@ file arch/mips/mips/mips3_clockintr.c
file arch/mips/cavium/octeon_dma.c
file arch/mips/cavium/octeon_intr.c
file arch/mips/cavium/octeon_misc.c
-file arch/mips/cavium/dev/octeon_ciu.c
-
-defparam opt_octeon.h OCTEON_ECLK
-defparam opt_octeon.h CNMAC_RING_MAX
-defparam opt_octeon.h CNMAC_RING_MIN
-defflag opt_octeon.h CNMAC_FAST_CRC
- CNMAC_IPD_RED
- CNMAC_USENFS
- OCTEON_USBN_CN31XX_DMA_WORKAROUND
device mainbus {}
attach mainbus at root
@@ -43,11 +34,9 @@ file arch/mips/cavium/octeon1p_iobus.c i
file arch/mips/cavium/dev/octeon_fpa.c iobus
file arch/mips/cavium/dev/octeon_pow.c iobus
file arch/mips/cavium/dev/octeon_fau.c iobus
-file arch/mips/cavium/dev/octeon_pip.c iobus
file arch/mips/cavium/dev/octeon_ipd.c iobus
file arch/mips/cavium/dev/octeon_pko.c iobus
file arch/mips/cavium/dev/octeon_asx.c iobus
-file arch/mips/cavium/dev/octeon_smi.c iobus
# I/O Bus devices
@@ -63,12 +52,33 @@ device octtwsi: i2cbus
attach octtwsi at iobus
file arch/mips/cavium/dev/octeon_twsi.c octtwsi
-device octmpi {}
+# XXX rename to octspi?
+device octmpi: spibus
attach octmpi at iobus
file arch/mips/cavium/dev/octeon_mpi.c octmpi
+device octcib {}
+attach octcib at iobus
+file arch/mips/cavium/dev/octeon_cib.c octcib
+
+device octcit {}
+attach octcit at iobus
+file arch/mips/cavium/dev/octeon_cit.c octcit
+
+device octciu {}
+attach octciu at iobus
+file arch/mips/cavium/dev/octeon_ciu.c octciu
+
+device octsmi {}
+attach octsmi at iobus
+file arch/mips/cavium/dev/octeon_smi.c octsmi
+
+device octpip {}
+attach octpip at iobus
+file arch/mips/cavium/dev/octeon_pip.c octpip
+
device octgmx {}
-attach octgmx at iobus
+attach octgmx at octpip
file arch/mips/cavium/dev/octeon_gmx.c octgmx
# On-chip ethernet device(s)
@@ -76,9 +86,20 @@ device cnmac: ether, ifnet, arp, mii
attach cnmac at octgmx
file arch/mips/cavium/dev/if_cnmac.c cnmac
+# CN3xxx/CN5xxx USB
attach dwctwo at iobus with octdwctwo
file arch/mips/cavium/dev/octeon_dwctwo.c octdwctwo
+# CN6xxx USB
+device octuctl {}
+attach octuctl at iobus with octuctl
+file arch/mips/cavium/dev/octeon_uctl.c octuctl
+
+# CN7xxx USB
+device octxctl {}
+attach octxctl at iobus with octxctl
+file arch/mips/cavium/dev/octeon_xctl.c octuctl
+
# Boot-Bus
device bootbus {}
@@ -97,5 +118,5 @@ include "dev/ata/files.ata"
# Machine-independent USB device support
include "dev/usb/files.usb"
-# Machine-independent PCI device support
-include "dev/pci/files.pci"
+## # Machine-independent PCI device support
+## include "dev/pci/files.pci"
