Split the files file into a generic one for armv7, and soc-specific ones.

Also, rename the bus omap devices attach to to a soc-specific one,
so that we can have more than one soc.
In the future there should be only one generic bus where soc drivers
attach.

4 files changed, 135 insertions, 150 deletions

diff --git a/sys/arch/armv7/conf/GENERIC-OMAP b/sys/arch/armv7/conf/GENERIC-OMAP
index 4608c171198..04fee708051 100644
--- a/sys/arch/armv7/conf/GENERIC-OMAP
+++ b/sys/arch/armv7/conf/GENERIC-OMAP
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC-OMAP,v 1.1 2013/09/04 14:38:25 patrick Exp $
+# $OpenBSD: GENERIC-OMAP,v 1.2 2013/09/05 11:48:42 patrick Exp $
 #
 # GENERIC machine description file
 #
@@ -54,7 +54,7 @@ cpu0		at mainbus?
 
 # OMAP3xxx/OMAP4xxx SoC
 omap0		at mainbus?
-omapid*		at soc?
+omapid*		at omap?
 
 # Cortex-A9 (OMAP4)
 cortex0		at mainbus?
@@ -63,26 +63,26 @@ amptimer*	at cortex?
 #armliicc*	at cortex?		# L2 cache controller
 
 # OMAP3 only
-intc*		at soc?			# interrupt controller
+intc*		at omap?			# interrupt controller
 
 # OMAP on-chip devices
-prcm*		at soc?			# power/clock controller
-sitaracm*	at soc?			# sitara control module
-omdog*		at soc?			# watchdog timer
-omgpio*		at soc?			# user-visible GPIO pins?
-gptimer*	at soc?			# general purpose timers
-dmtimer*	at soc?			# am335x dual mode timers
-ommmc*		at soc?			# SD/MMC card controller
-omusbtll*	at soc?
-cpsw*		at soc?
-
-#omkbd*		at soc?
+prcm*		at omap?			# power/clock controller
+sitaracm*	at omap?			# sitara control module
+omdog*		at omap?			# watchdog timer
+omgpio*		at omap?			# user-visible GPIO pins?
+gptimer*	at omap?			# general purpose timers
+dmtimer*	at omap?			# am335x dual mode timers
+ommmc*		at omap?			# SD/MMC card controller
+omusbtll*	at omap?
+cpsw*		at omap?
+
+#omkbd*		at omap?
 #wskbd*		at omkbd? mux 1
 
-ehci*		at soc?			# EHCI (shim)
+ehci*		at omap?			# EHCI (shim)
 usb*		at ehci?
 
-#usbotg0	at soc?
+#usbotg0	at omap?
 #usb*		at ohci?
 
 ## USB bus support
@@ -146,10 +146,10 @@ ch*		at scsibus?
 uk*		at scsibus?
 
 # onboard uarts
-com*		at soc?
+com*		at omap?
 
 # LCD
-#omdisplay0	at soc?			# LCD DISPLAY
+#omdisplay0	at omap?			# LCD DISPLAY
 #wsdisplay*	at omdisplay? console ?
 
 sdmmc*		at ommmc?		# SD/MMC bus
diff --git a/sys/arch/armv7/conf/RAMDISK-OMAP b/sys/arch/armv7/conf/RAMDISK-OMAP
index eada81b6159..40c51fe8c96 100644
--- a/sys/arch/armv7/conf/RAMDISK-OMAP
+++ b/sys/arch/armv7/conf/RAMDISK-OMAP
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK-OMAP,v 1.1 2013/09/04 14:38:25 patrick Exp $
+# $OpenBSD: RAMDISK-OMAP,v 1.2 2013/09/05 11:48:42 patrick Exp $
 #
 # GENERIC machine description file
 #
@@ -61,7 +61,7 @@ cpu0		at mainbus?
 
 # OMAP3xxx/OMAP4xxx SoC
 omap0		at mainbus?
-omapid*		at soc?
+omapid*		at omap?
 
 # Cortex-A9 (OMAP4)
 cortex0		at mainbus?
@@ -70,32 +70,32 @@ amptimer*	at cortex?
 #armliicc*	at cortex?		# L2 cache controller
 
 # OMAP3 only
-intc*		at soc?			# interrupt controller
+intc*		at omap?			# interrupt controller
 
 # OMAP on-chip devices
-prcm*		at soc?			# power/clock controller
-sitaracm*	at soc?			# sitara control module
-omdog*		at soc?			# watchdog timer
-omgpio*		at soc?			# user-visible GPIO pins?
-gptimer*	at soc?			# general purpose timers
-dmtimer*	at soc?			# am335x dual mode timers
-ommmc*		at soc?			# SD/MMC card controller
-omusbtll*	at soc?
-cpsw*		at soc?
-
-#omkbd0		at soc?
+prcm*		at omap?			# power/clock controller
+sitaracm*	at omap?			# sitara control module
+omdog*		at omap?			# watchdog timer
+omgpio*		at omap?			# user-visible GPIO pins?
+gptimer*	at omap?			# general purpose timers
+dmtimer*	at omap?			# am335x dual mode timers
+ommmc*		at omap?			# SD/MMC card controller
+omusbtll*	at omap?
+cpsw*		at omap?
+
+#omkbd0		at omap?
 #wskbd*		at omkbd? mux 1
 
-ehci*		at soc?			# EHCI (shim)
+ehci*		at omap?			# EHCI (shim)
 usb*		at ehci?
 
-#mcspi0		at soc? addr 0x48098000 intr 65
-#mcspi1		at soc? addr 0x4809A000 intr 66
+#mcspi0		at omap? addr 0x48098000 intr 65
+#mcspi1		at omap? addr 0x4809A000 intr 66
 
-#atlas0		at soc? intr 85	# really a spi device, not soc
+#atlas0		at omap? intr 85	# really a spi device, not omap
 #wskbd*		at atlas? mux 1 
 
-#usbotg0	at soc?
+#usbotg0	at omap?
 #usb*		at ohci?
 
 ## USB bus support
@@ -161,10 +161,10 @@ uk*		at scsibus?
 
 
 # onboard uarts
-com*		at soc?
+com*		at omap?
 
 # LCD
-#omdisplay0	at soc?
+#omdisplay0	at omap?
 #wsdisplay*	at omdisplay? console ?
 
 sdmmc*	at ommmc?		# SD/MMC bus
diff --git a/sys/arch/armv7/conf/files.armv7 b/sys/arch/armv7/conf/files.armv7
index da7931d8204..596d07ad382 100644
--- a/sys/arch/armv7/conf/files.armv7
+++ b/sys/arch/armv7/conf/files.armv7
@@ -1,7 +1,4 @@
-#	$OpenBSD: files.armv7,v 1.1 2013/09/04 14:38:25 patrick Exp $
-#
-# First try for arm-specific configuration info
-#
+#	$OpenBSD: files.armv7,v 1.2 2013/09/05 11:48:42 patrick Exp $
 
 maxpartitions	16
 maxusers	2 8 64
@@ -13,132 +10,35 @@ major	{rd = 18}
 
 file	arch/arm/arm/conf.c
 
-file	arch/armv7/omap/beagle_machdep.c
-
 #interrupt API layer
 file	arch/armv7/armv7/intr.c
 
 # u-boot argument support
 file	arch/armv7/armv7/uboot_tags.c
 
-# note that the order of the devices in _this_ file
-# affects the order that the devices will configure.
+# CPU support and integrated peripherals
+file	arch/arm/arm/irq_dispatch.S
+file	arch/arm/arm/softintr.c
 
-# XXX arch/arm/omap
-define soc {}
-device omap: soc
-attach omap at mainbus
-file	arch/armv7/omap/omap.c			omap
-file	arch/armv7/omap/omap3.c			omap
-file	arch/armv7/omap/omap4.c			omap
-file	arch/armv7/omap/am335x.c		omap
+# Generic MD files
+file	arch/armv7/armv7/autoconf.c
+file	arch/arm/arm/disksubr.c			disk
 
 include "dev/sdmmc/files.sdmmc"
 
-device ommmc: sdmmcbus
-attach ommmc at soc
-file	arch/armv7/omap/ommmc.c			ommmc
-
 # Media Independent Interface (mii)
 include "dev/mii/files.mii"
 
-device cpsw: ether, ifnet, mii, ifmedia
-attach cpsw at soc
-file	arch/armv7/omap/if_cpsw.c		cpsw
-
-device prcm
-attach prcm at soc
-file	arch/armv7/omap/prcm.c			prcm
-
-device sitaracm
-attach sitaracm at soc
-file	arch/armv7/omap/am335x_cm_padconf.c	sitaracm
-file	arch/armv7/omap/sitara_cm.c		sitaracm
-
-device omgpio
-attach omgpio at soc
-file   arch/armv7/omap/omgpio.c			omgpio
-
-device intc
-attach intc at soc
-file	arch/armv7/omap/intc.c			intc
-
-device gptimer
-attach gptimer at soc
-file	arch/armv7/omap/gptimer.c		gptimer
-
-device dmtimer
-attach dmtimer at soc
-file	arch/armv7/omap/dmtimer.c		dmtimer
-
-device omapid
-attach omapid at soc
-file	arch/armv7/omap/omapid.c		omapid
-
-device omdog
-attach omdog at soc
-file	arch/armv7/omap/omdog.c			omdog
-
-attach ohci at soc with omohci
-file	arch/armv7/omap/omohci.c		omohci
-
-attach ehci at soc with omehci
-file	arch/armv7/omap/omehci.c		omehci
-
-# NS16550 compatible serial ports
-attach	com at soc with com_omap
-file	arch/armv7/omap/omap_com.c		com_omap
+# Machine-independent I2C drivers
+include "dev/i2c/files.i2c"
 
-device omusbtll
-attach omusbtll at soc
-file arch/armv7/omap/omusbtll.c			omusbtll
-
-device omkbd: wskbddev
-attach omkbd at soc
-file	arch/armv7/omap/omkbd.c			omkbd
-
-# LCD frame buffer
-device omdisplay: wsemuldisplaydev, rasops16
-attach omdisplay at soc
-file arch/armv7/omap/omdisplay.c		omdisplay
-
-#
 # Machine-independent SCSI drivers
-#
 include "scsi/files.scsi"
 include "dev/atapiscsi/files.atapiscsi"
 
-# CPU support and integrated peripherals
-file	arch/arm/arm/irq_dispatch.S
-file	arch/arm/arm/softintr.c
-
-# MCSPI - spi 
-device mcspi 
-attach mcspi at soc
-file	arch/armv7/omap/mcspi.c			mcspi
-
-# pseudo-Audio Device Driver
-device oaudio: audio
-attach oaudio at soc				# configure after Atlas Driver
-file arch/armv7/omap/beagle_audio.c		oaudio
-
-#
 # Machine-independent ATA drivers
-#
 include "dev/ata/files.ata"
 
-# Generic MD files
-file	arch/armv7/armv7/autoconf.c
-
-file	arch/arm/arm/disksubr.c			disk
-
-
-# ARM FPE
-file	arch/arm/fpe-arm/armfpe_glue.S		armfpe
-file	arch/arm/fpe-arm/armfpe_init.c		armfpe
-file	arch/arm/fpe-arm/armfpe.s		armfpe
-
-
 # Machine-independent I2O drivers.
 include "dev/i2o/files.i2o"
 
@@ -153,7 +53,8 @@ include "dev/usb/files.usb"
 # Bluetooth
 include "dev/bluetooth/files.bluetooth"
 
-#
 # Machine-independent GPIO drivers
-#
 include "dev/gpio/files.gpio"
+
+# SoC includes
+include "arch/armv7/omap/files.omap"
diff --git a/sys/arch/armv7/omap/files.omap b/sys/arch/armv7/omap/files.omap
new file mode 100644
index 00000000000..24348cd2a21
--- /dev/null
+++ b/sys/arch/armv7/omap/files.omap
@@ -0,0 +1,84 @@
+#	$OpenBSD: files.omap,v 1.1 2013/09/05 11:48:43 patrick Exp $
+
+define omap {}
+device omap: omap
+attach omap at mainbus
+file	arch/armv7/omap/beagle_machdep.c	omap
+file	arch/armv7/omap/omap.c			omap
+file	arch/armv7/omap/omap3.c			omap
+file	arch/armv7/omap/omap4.c			omap
+file	arch/armv7/omap/am335x.c		omap
+
+device ommmc: sdmmcbus
+attach ommmc at omap
+file	arch/armv7/omap/ommmc.c			ommmc
+
+device cpsw: ether, ifnet, mii, ifmedia
+attach cpsw at omap
+file	arch/armv7/omap/if_cpsw.c		cpsw
+
+device prcm
+attach prcm at omap
+file	arch/armv7/omap/prcm.c			prcm
+
+device sitaracm
+attach sitaracm at omap
+file	arch/armv7/omap/am335x_cm_padconf.c	sitaracm
+file	arch/armv7/omap/sitara_cm.c		sitaracm
+
+device omgpio
+attach omgpio at omap
+file   arch/armv7/omap/omgpio.c			omgpio
+
+device intc
+attach intc at omap
+file	arch/armv7/omap/intc.c			intc
+
+device gptimer
+attach gptimer at omap
+file	arch/armv7/omap/gptimer.c		gptimer
+
+device dmtimer
+attach dmtimer at omap
+file	arch/armv7/omap/dmtimer.c		dmtimer
+
+device omapid
+attach omapid at omap
+file	arch/armv7/omap/omapid.c		omapid
+
+device omdog
+attach omdog at omap
+file	arch/armv7/omap/omdog.c			omdog
+
+attach ohci at omap with omohci
+file	arch/armv7/omap/omohci.c		omohci
+
+attach ehci at omap with omehci
+file	arch/armv7/omap/omehci.c		omehci
+
+# NS16550 compatible serial ports
+attach	com at omap with com_omap
+file	arch/armv7/omap/omap_com.c		com_omap
+
+device omusbtll
+attach omusbtll at omap
+file arch/armv7/omap/omusbtll.c			omusbtll
+
+device omkbd: wskbddev
+attach omkbd at omap
+file	arch/armv7/omap/omkbd.c			omkbd
+
+# LCD frame buffer
+device omdisplay: wsemuldisplaydev, rasops16
+attach omdisplay at omap
+file arch/armv7/omap/omdisplay.c		omdisplay
+
+# MCSPI - spi 
+device mcspi 
+attach mcspi at omap
+file	arch/armv7/omap/mcspi.c			mcspi
+
+# pseudo-Audio Device Driver
+device oaudio: audio
+attach oaudio at omap				# configure after Atlas Driver
+file arch/armv7/omap/beagle_audio.c		oaudio