diff options
| author | Lennert Buytenhek <buytenh@wantstofly.org> | 2010-10-15 10:50:26 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nico@fluxnic.net> | 2011-03-03 16:27:01 -0500 |
| commit | 4ee1f6b574765a6c97f945e6b0277e5ccac38cb5 (patch) | |
| tree | c5e0667c637bd13ddcaca694a571b82254e278eb /arch/arm/mach-dove/include | |
| parent | 40ff15a6cb9e7e84b72ef962d9d27551fb00f54b (diff) | |
ARM: Remove dependency of plat-orion time code on mach directory includes.
This patch makes the various mach dirs that use the plat-orion time
code pass in timer and bridge addresses explicitly, instead of having
plat-orion get those values by including a mach dir include file --
the latter mechanism is problematic if you want to support multiple
ARM platforms in the same kernel image.
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Signed-off-by: Nicolas Pitre <nico@fluxnic.net>
Diffstat (limited to 'arch/arm/mach-dove/include')
| -rw-r--r-- | arch/arm/mach-dove/include/mach/bridge-regs.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/mach-dove/include/mach/bridge-regs.h b/arch/arm/mach-dove/include/mach/bridge-regs.h index 214a4c31f069..226949dc4ac0 100644 --- a/arch/arm/mach-dove/include/mach/bridge-regs.h +++ b/arch/arm/mach-dove/include/mach/bridge-regs.h | |||
| @@ -26,10 +26,6 @@ | |||
| 26 | #define SYSTEM_SOFT_RESET (BRIDGE_VIRT_BASE | 0x010c) | 26 | #define SYSTEM_SOFT_RESET (BRIDGE_VIRT_BASE | 0x010c) |
| 27 | #define SOFT_RESET 0x00000001 | 27 | #define SOFT_RESET 0x00000001 |
| 28 | 28 | ||
| 29 | #define BRIDGE_CAUSE (BRIDGE_VIRT_BASE | 0x0110) | ||
| 30 | #define BRIDGE_MASK (BRIDGE_VIRT_BASE | 0x0114) | ||
| 31 | #define BRIDGE_INT_TIMER0 0x0002 | ||
| 32 | #define BRIDGE_INT_TIMER1 0x0004 | ||
| 33 | #define BRIDGE_INT_TIMER1_CLR (~0x0004) | 29 | #define BRIDGE_INT_TIMER1_CLR (~0x0004) |
| 34 | 30 | ||
| 35 | #define IRQ_VIRT_BASE (BRIDGE_VIRT_BASE | 0x0200) | 31 | #define IRQ_VIRT_BASE (BRIDGE_VIRT_BASE | 0x0200) |