diff options
| author | Jonathan Matthew <jmatthew@cvs.openbsd.org> | 2016-03-18 05:38:11 +0000 |
|---|---|---|
| committer | Jonathan Matthew <jmatthew@cvs.openbsd.org> | 2016-03-18 05:38:11 +0000 |
| commit | 4fe9bb8c281e32f8554addaa7d4098a336134125 (patch) | |
| tree | 1defe2d317755004c8fb8341dcb9eb0852ba5827 /sys/arch/octeon/conf | |
| parent | bd7f7bd5eb8a950a652060c499cad643741dcac7 (diff) | |
add octuctl, a driver for the Octeon II usb controller interface, and
attachments for ehci and ohci.
ok uebayasi@ jasper@ visa@ mpi@
Diffstat (limited to 'sys/arch/octeon/conf')
| -rw-r--r-- | sys/arch/octeon/conf/GENERIC | 7 | ||||
| -rw-r--r-- | sys/arch/octeon/conf/RAMDISK | 9 | ||||
| -rw-r--r-- | sys/arch/octeon/conf/files.octeon | 10 |
3 files changed, 23 insertions, 3 deletions
diff --git a/sys/arch/octeon/conf/GENERIC b/sys/arch/octeon/conf/GENERIC index 60fa5eac3af..9f6ebf64ba6 100644 --- a/sys/arch/octeon/conf/GENERIC +++ b/sys/arch/octeon/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.24 2016/01/14 17:20:34 visa Exp $ +# $OpenBSD: GENERIC,v 1.25 2016/03/18 05:38:10 jmatthew Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -64,9 +64,14 @@ wd* at pciide? flags 0x0000 # USB Controllers dwctwo0 at iobus? irq 56 +octuctl0 at iobus? irq 56 +ehci0 at octuctl? +ohci0 at octuctl? # USB bus support usb* at dwctwo? +usb* at ehci? +usb* at ohci? # USB devices uhub* at usb? # USB Hubs diff --git a/sys/arch/octeon/conf/RAMDISK b/sys/arch/octeon/conf/RAMDISK index cf0a04bf819..a2182722914 100644 --- a/sys/arch/octeon/conf/RAMDISK +++ b/sys/arch/octeon/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.23 2016/01/14 17:20:34 visa Exp $ +# $OpenBSD: RAMDISK,v 1.24 2016/03/18 05:38:10 jmatthew Exp $ machine octeon mips64 maxusers 4 @@ -55,7 +55,14 @@ pciide* at pci? flags 0x0000 wd* at pciide? flags 0x0000 dwctwo0 at iobus0 irq 56 +octuctl0 at iobus0 irq 56 +ehci0 at octuctl? +ohci0 at octuctl? + usb* at dwctwo? +usb* at ehci? +usb* at ohci? + uhub* at usb? uhub* at uhub? umass* at uhub? diff --git a/sys/arch/octeon/conf/files.octeon b/sys/arch/octeon/conf/files.octeon index 4db0107193d..08a67b2fc00 100644 --- a/sys/arch/octeon/conf/files.octeon +++ b/sys/arch/octeon/conf/files.octeon @@ -1,4 +1,4 @@ -# $OpenBSD: files.octeon,v 1.28 2016/01/14 17:20:34 visa Exp $ +# $OpenBSD: files.octeon,v 1.29 2016/03/18 05:38:10 jmatthew Exp $ # Standard stanzas config(8) can't run without maxpartitions 16 @@ -71,6 +71,14 @@ file arch/octeon/dev/cn30xxsmi.c iobus attach dwctwo at iobus with octdwctwo file arch/octeon/dev/octdwctwo.c octdwctwo needs-flag +device octuctl {} +attach octuctl at iobus +file arch/octeon/dev/octuctl.c octuctl needs-flag +attach ehci at octuctl with octehci +file arch/octeon/dev/octehci.c octehci +attach ohci at octuctl with octohci +file arch/octeon/dev/octohci.c octohci + # On-board CF device octcf: disk attach octcf at iobus |