diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2010-02-26 14:53:12 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2010-02-26 14:53:12 +0000 |
| commit | 1c3b3d3329579fe9b81dc27e9b44b07cafe69d99 (patch) | |
| tree | 4e593b7a5d86d482c26d6fcf88872173a4694682 /sys/arch/loongson/conf | |
| parent | 0bc174e8b54efbce9bfee9b571da4a729be3bfb3 (diff) | |
Subdevice interrupt dispatcher for voyager(4) and ohci@voyager device, only
allowed to match on old gdium artwork, as newer artwork have nothing
connected to the usb pins, and this causes the empty bus probe to stall the
boot a few seconds.
Diffstat (limited to 'sys/arch/loongson/conf')
| -rw-r--r-- | sys/arch/loongson/conf/GENERIC | 4 | ||||
| -rw-r--r-- | sys/arch/loongson/conf/RAMDISK | 3 | ||||
| -rw-r--r-- | sys/arch/loongson/conf/files.loongson | 6 |
3 files changed, 9 insertions, 4 deletions
diff --git a/sys/arch/loongson/conf/GENERIC b/sys/arch/loongson/conf/GENERIC index 2876a9b4d37..b9ed254b97f 100644 --- a/sys/arch/loongson/conf/GENERIC +++ b/sys/arch/loongson/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.14 2010/02/24 22:16:18 miod Exp $ +# $OpenBSD: GENERIC,v 1.15 2010/02/26 14:53:11 miod Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -62,7 +62,7 @@ stsec0 at iic0 # ST7 Embedded Controller lmtemp0 at iic0 # National Semiconductor LM75 mfokclock0 at iic0 # M41T8x todclock #iic* at voyager? -#ohci* at voyager? +ohci* at voyager? smfb* at voyager? wsdisplay* at smfb? diff --git a/sys/arch/loongson/conf/RAMDISK b/sys/arch/loongson/conf/RAMDISK index 02eaff0c8e4..4645e275491 100644 --- a/sys/arch/loongson/conf/RAMDISK +++ b/sys/arch/loongson/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.8 2010/02/19 00:21:43 miod Exp $ +# $OpenBSD: RAMDISK,v 1.9 2010/02/26 14:53:11 miod Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -68,6 +68,7 @@ gdiumiic0 at gpio0 offset 6 mask 0x81 # pins 6 and 13 gdiumiic0 at gpio0 offset 46 mask 0x03 # pins 46 and 47 iic0 at gdiumiic0 mfokclock0 at iic0 # M41T8x todclock +ohci* at voyager? smfb* at voyager? wsdisplay* at smfb? diff --git a/sys/arch/loongson/conf/files.loongson b/sys/arch/loongson/conf/files.loongson index 6cdb10f0ce7..a5099a90154 100644 --- a/sys/arch/loongson/conf/files.loongson +++ b/sys/arch/loongson/conf/files.loongson @@ -1,4 +1,4 @@ -# $OpenBSD: files.loongson,v 1.6 2010/02/24 22:16:18 miod Exp $ +# $OpenBSD: files.loongson,v 1.7 2010/02/26 14:53:11 miod Exp $ # Standard stanzas config(8) can't run without maxpartitions 16 @@ -98,6 +98,10 @@ device mfokclock attach mfokclock at i2c file arch/loongson/dev/m41t8xclock.c mfokclock +# SM502 OHCI +attach ohci at voyager with ohci_voyager +file arch/loongson/dev/ohci_voyager.c ohci_voyager + # Silicon Motion SM502/SM712 frame buffer device smfb: wsemuldisplaydev, rasops16 attach smfb at pci with smfb_pci |