USB support for C3000, much thanks to dlg@ for pxa2x0_ohci.c

3 files changed, 81 insertions, 22 deletions

diff --git a/sys/arch/zaurus/conf/GENERIC b/sys/arch/zaurus/conf/GENERIC
index 44a7d6d63b7..4c8ffbf9e4f 100644
--- a/sys/arch/zaurus/conf/GENERIC
+++ b/sys/arch/zaurus/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.1 2004/12/31 00:04:35 drahn Exp $
+#	$OpenBSD: GENERIC,v 1.2 2005/01/04 03:47:00 drahn Exp $
 #
 # GENERIC machine description file
 #
@@ -74,6 +74,37 @@ pxaip0		at mainbus?
 pxaintc0	at pxaip?	# interrupt controller
 pxagpio0	at pxaip?	# GPIO
 saost0		at pxaip? addr 0x40a00000 size 0x20
+ohci0		at pxaip? addr 0x4c000000 size 0x70 intr 3
+usb*		at ohci?
+
+# USB bus support
+usb*		at ohci?	flags 0x1
+uhub*		at usb?
+uhub*		at uhub?
+
+uhidev*		at uhub?
+uhid*		at uhidev?		# USB Generic HID devices
+ukbd*		at uhidev?		# USB HID Keyboard devices
+wskbd*		at ukbd? mux 1
+#ums*		at uhub?		# USB Mice
+#wsmouse*	at ums? mux 0
+#ulpt*		at uhub?		# USB Printer
+aue*		at uhub?		# ADMtek AN986 Pegasus Ethernet
+axe*		at uhub?		# ASIX Electronics AX88172 USB Ethernet
+cue*		at uhub?		# CATC USB-EL1201A based Ethernet
+kue*		at uhub?		# Kawasaki KL5KUSB101B based Ethernet
+cdce*		at uhub?		# CDC Ethernet
+upl*		at uhub?		# Prolific PL2301/PL2302 host-to-host
+udav*		at uhub?		# Davicom DM9601 based Ethernet
+url*		at uhub?		# Realtek RTL8150L based adapters
+wi*		at uhub?		# WaveLAN IEEE 802.11DS
+#uscanner*	at uhub?		# USB Scanner driver
+#usscanner*	at uhub?		# USB SCSI scanners
+#scsibus*	at usscanner?
+#uyap*		at uhub?		# Y@P firmware loader
+#ugen*		at uhub?		# USB Generic driver
+umass*		at uhub?		# USB Mass Storage devices
+scsibus*	at umass?
 
 # cotulla integrated 16550 UARTs
 options COM_PXA2X0
@@ -94,9 +125,12 @@ wi*		at pcmcia?
 wdc*		at pcmcia?
 
 # IDE hard drives
-wd0	at wdc? flags 0x0000
-wd*	at wdc? flags 0x0000
+wd0		at wdc? flags 0x0000
+wd*		at wdc? flags 0x0000
 
+# PHY
+rlphy*		at mii?		# RealTek 8139 internal PHYs
+ukphy*		at mii?		# generic unknown PHYs
 
 # On-board device support
 obio0		at pxaip? intr 8
@@ -109,5 +143,5 @@ wsdisplay*	at lcd? console ?
 options 	WSEMUL_VT100		# VT100 / VT220 emulation
 
 # Pseudo-Devices
-#pseudo-device	wsmux		2	# mouse & keyboard multiplexor
+pseudo-device	wsmux		2	# mouse & keyboard multiplexor
 pseudo-device	crypto		1
diff --git a/sys/arch/zaurus/conf/RAMDISK b/sys/arch/zaurus/conf/RAMDISK
index 4ce2d6f537f..422574a3834 100644
--- a/sys/arch/zaurus/conf/RAMDISK
+++ b/sys/arch/zaurus/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK,v 1.2 2004/12/31 00:40:52 drahn Exp $
+#	$OpenBSD: RAMDISK,v 1.3 2005/01/04 03:47:00 drahn Exp $
 # $NetBSD: GENERIC,v 1.27.4.1 2002/08/01 04:18:06 lukem Exp $
 #
 # GENERIC machine description file
@@ -82,6 +82,37 @@ pxaip0		at mainbus?
 pxaintc0	at pxaip?	# interrupt controller
 pxagpio0	at pxaip?	# GPIO
 saost0		at pxaip? addr 0x40a00000 size 0x20
+ohci0		at pxaip? addr 0x4c000000 size 0x70 intr 3
+usb*		at ohci?
+
+# USB bus support
+usb*		at ohci?	flags 0x1
+uhub*		at usb?
+uhub*		at uhub?
+
+uhidev*		at uhub?
+uhid*		at uhidev?		# USB Generic HID devices
+ukbd*		at uhidev?		# USB HID Keyboard devices
+wskbd*		at ukbd? mux 1
+#ums*		at uhub?		# USB Mice
+#wsmouse*	at ums? mux 0
+#ulpt*		at uhub?		# USB Printer
+aue*		at uhub?		# ADMtek AN986 Pegasus Ethernet
+axe*		at uhub?		# ASIX Electronics AX88172 USB Ethernet
+cue*		at uhub?		# CATC USB-EL1201A based Ethernet
+kue*		at uhub?		# Kawasaki KL5KUSB101B based Ethernet
+cdce*		at uhub?		# CDC Ethernet
+upl*		at uhub?		# Prolific PL2301/PL2302 host-to-host
+udav*		at uhub?		# Davicom DM9601 based Ethernet
+url*		at uhub?		# Realtek RTL8150L based adapters
+wi*		at uhub?		# WaveLAN IEEE 802.11DS
+#uscanner*	at uhub?		# USB Scanner driver
+#usscanner*	at uhub?		# USB SCSI scanners
+#scsibus*	at usscanner?
+#uyap*		at uhub?		# Y@P firmware loader
+#ugen*		at uhub?		# USB Generic driver
+umass*		at uhub?		# USB Mass Storage devices
+scsibus*	at umass?
 
 # cotulla integrated 16550 UARTs
 options COM_PXA2X0
@@ -105,6 +136,10 @@ wdc*		at pcmcia?
 # IDE hard drives
 wd*	at wdc? flags 0x0000
 
+# PHY
+rlphy*		at mii?		# RealTek 8139 internal PHYs
+ukphy*		at mii?		# generic unknown PHYs
+
 # On-board device support
 obio0		at pxaip? intr 8
 #sm0		at obio? addr 0x0c000000 intr 3 	# on-board SMC 91C96
@@ -117,7 +152,7 @@ options 	WSEMUL_VT100		# VT100 / VT220 emulation
 
 
 # Pseudo-Devices
-#pseudo-device	wsmux		2	# mouse & keyboard multiplexor
+pseudo-device	wsmux		2	# mouse & keyboard multiplexor
 #pseudo-device	crypto		1
 pseudo-device	loop		1	# network loopback
 pseudo-device	bpfilter	1	# packet filter
diff --git a/sys/arch/zaurus/conf/files.zaurus b/sys/arch/zaurus/conf/files.zaurus
index 44fe3482280..4a99dc79137 100644
--- a/sys/arch/zaurus/conf/files.zaurus
+++ b/sys/arch/zaurus/conf/files.zaurus
@@ -1,4 +1,3 @@
-#	$OpenBSD: files.zaurus,v 1.4 2005/01/02 19:43:07 drahn Exp $
 #	$NetBSD: files.pxaarm,v 1.17 2003/02/17 20:51:53 ichiro Exp $
 #
 # First try for arm-specific configuration info
@@ -60,21 +59,6 @@ file	arch/arm/fpe-arm/armfpe.s		armfpe
 # Machine-independent I2O drivers.
 include "dev/i2o/files.i2o"
 
-#
-# Include PCI config
-#
-include "dev/mii/files.mii"
-include "dev/pci/files.pci"
-
-device	pcib: isabus
-attach	pcib at pci
-file	arch/zaurus/pci/pcib.c			pcib
-
-file	arch/zaurus/pci/pciide_machdep.c	pciide
-
-# Include USB stuff
-include "dev/usb/files.usb"
-
 # Include WSCONS stuff
 include "dev/wscons/files.wscons"
 include "dev/rasops/files.rasops"
@@ -85,3 +69,9 @@ include "dev/pckbc/files.pckbc"
 # kludge, not present on zaurus, but needed for arm/conf.c
 device  fcom: tty, bus_space_generic
 file    arch/arm/footbridge/footbridge_com.c            fcom needs-flag
+
+# Include USB stuff
+include "dev/usb/files.usb"
+
+# Media Independent Interface (mii)
+include "../../../dev/mii/files.mii"