diff options
| author | Catalin Marinas <catalin.marinas@arm.com> | 2008-02-04 17:43:02 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-02-04 17:52:26 +0000 |
| commit | 8cc4c5488a28fe6a1f834e99317bb762798600f7 (patch) | |
| tree | ccd8a04655dbb87500d982c5be6a01831bcef6b7 /arch/arm/mach-realview/realview_eb.c | |
| parent | c4057f5260650f165054bc56e16acc4aa0510d4f (diff) | |
| download | kernel_samsung_smdk4412-8cc4c5488a28fe6a1f834e99317bb762798600f7.zip kernel_samsung_smdk4412-8cc4c5488a28fe6a1f834e99317bb762798600f7.tar.gz kernel_samsung_smdk4412-8cc4c5488a28fe6a1f834e99317bb762798600f7.tar.bz2 | |
[ARM] 4820/1: RealView: Select the timer IRQ at run-time
This patch sets the timer IRQ at run-time by moving the sys_timer
structure and the timer_init function to the realview_eb.c file. This
allows multiple RealView platforms to be compiled in the same kernel
image.
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-realview/realview_eb.c')
| -rw-r--r-- | arch/arm/mach-realview/realview_eb.c | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/arch/arm/mach-realview/realview_eb.c b/arch/arm/mach-realview/realview_eb.c index f36af13..20b05f2 100644 --- a/arch/arm/mach-realview/realview_eb.c +++ b/arch/arm/mach-realview/realview_eb.c @@ -36,6 +36,7 @@ #include <asm/mach/arch.h> #include <asm/mach/map.h> #include <asm/mach/mmc.h> +#include <asm/mach/time.h> #include <asm/arch/board-eb.h> #include <asm/arch/irqs.h> @@ -304,6 +305,22 @@ static void realview_eb11mp_fixup(void) realview_eb_smc91x_resources[1].end = IRQ_EB11MP_ETH; } +static void __init realview_eb_timer_init(void) +{ + unsigned int timer_irq; + + if (core_tile_eb11mp()) + timer_irq = IRQ_EB11MP_TIMER0_1; + else + timer_irq = IRQ_EB_TIMER0_1; + + realview_timer_init(timer_irq); +} + +static struct sys_timer realview_eb_timer = { + .init = realview_eb_timer_init, +}; + static void __init realview_eb_init(void) { int i; @@ -339,6 +356,6 @@ MACHINE_START(REALVIEW_EB, "ARM-RealView EB") .boot_params = 0x00000100, .map_io = realview_eb_map_io, .init_irq = gic_init_irq, - .timer = &realview_timer, + .timer = &realview_eb_timer, .init_machine = realview_eb_init, MACHINE_END |