diff options
| author | Dale Rahn <drahn@cvs.openbsd.org> | 2011-11-05 12:30:59 +0000 |
|---|---|---|
| committer | Dale Rahn <drahn@cvs.openbsd.org> | 2011-11-05 12:30:59 +0000 |
| commit | eb40d36c137c09e6565c5ccf218208c5c8fc2091 (patch) | |
| tree | ca89c4047bc0e94a3e4338a892b1ae133ba7a613 /sys | |
| parent | 763bcc3c07d7dcc15704a953a3ac6dd9c6e06ffe (diff) | |
Attempt to configure the interrupt controller and global timer on cortex-a9
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/beagle/conf/GENERIC | 7 | ||||
| -rw-r--r-- | sys/arch/beagle/conf/RAMDISK | 5 | ||||
| -rw-r--r-- | sys/arch/beagle/conf/files.beagle | 13 |
3 files changed, 17 insertions, 8 deletions
diff --git a/sys/arch/beagle/conf/GENERIC b/sys/arch/beagle/conf/GENERIC index cb4f1812c96..d4acfd2dbdf 100644 --- a/sys/arch/beagle/conf/GENERIC +++ b/sys/arch/beagle/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.9 2011/10/21 22:55:01 drahn Exp $ +# $OpenBSD: GENERIC,v 1.10 2011/11/05 12:30:58 drahn Exp $ # # GENERIC machine description file # @@ -58,10 +58,11 @@ ahb0 at mainbus? prcm0 at ahb? addr 0x48004000 # power/clock controller intc0 at ahb? addr 0x48200000 # interrupt controller +ampintc0 at ahb? gptimer0 at ahb? addr 0x49032000 intr 38 # timer GPTIMER2 gptimer1 at ahb? addr 0x48318000 intr 37 # timer GPTIMER1 -#sm0 at ahb? addr 0x0C000300 intr 188 #ethernet +amptimer0 at ahb? addr 0x48240600 omgpio0 at ahb? addr 0x48310000 intr 29 omgpio1 at ahb? addr 0x49050000 intr 30 @@ -86,8 +87,6 @@ ehci0 at ahb? addr 0x48064800 size 0x400 intr 77 # ehci (shim) usb* at ehci? -#mcspi0 at ahb? addr 0x48098000 intr 65 -#mcspi1 at ahb? addr 0x4809A000 intr 66 #usbotg0 at ahb? addr 0x4c000000 size 0x70 intr 3 #usb* at ohci? diff --git a/sys/arch/beagle/conf/RAMDISK b/sys/arch/beagle/conf/RAMDISK index fd1a5582083..9dced825eb0 100644 --- a/sys/arch/beagle/conf/RAMDISK +++ b/sys/arch/beagle/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.12 2011/10/17 03:03:59 drahn Exp $ +# $OpenBSD: RAMDISK,v 1.13 2011/11/05 12:30:58 drahn Exp $ # # GENERIC machine description file # @@ -63,10 +63,11 @@ ahb0 at mainbus? prcm0 at ahb? addr 0x48004000 # power/clock controller intc0 at ahb? addr 0x48200000 # interrupt controller +ampintc0 at ahb? gptimer0 at ahb? addr 0x49032000 intr 38 # timer GPTIMER2 gptimer1 at ahb? addr 0x48318000 intr 37 # timer GPTIMER1 -#sm0 at ahb? addr 0x0C000300 intr 188 #ethernet +amptimer0 at ahb? addr 0x48240600 omgpio0 at ahb? addr 0x48310000 intr 29 omgpio1 at ahb? addr 0x49050000 intr 30 diff --git a/sys/arch/beagle/conf/files.beagle b/sys/arch/beagle/conf/files.beagle index 19f22ae3a10..2fce353d60d 100644 --- a/sys/arch/beagle/conf/files.beagle +++ b/sys/arch/beagle/conf/files.beagle @@ -1,4 +1,4 @@ -# $OpenBSD: files.beagle,v 1.9 2011/10/24 22:49:07 drahn Exp $ +# $OpenBSD: files.beagle,v 1.10 2011/11/05 12:30:58 drahn Exp $ # # First try for arm-specific configuration info # @@ -34,6 +34,16 @@ file arch/beagle/beagle/uboot_tags.c # note that the order of the devices in _this_ file # affects the order that the devices will configure. +# cortex based peripherals +device ampintc +attach ampintc at ahb +file arch/beagle/dev/ampintc.c ampintc + +device amptimer +attach amptimer at ahb +file arch/beagle/dev/amptimer.c amptimer + + include "dev/sdmmc/files.sdmmc" device prcm @@ -84,7 +94,6 @@ device omdisplay: wsemuldisplaydev, rasops16 attach omdisplay at ahb file arch/beagle/dev/omdisplay.c omdisplay - # # Machine-independent SCSI drivers # |