lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[ARM] 4820/1: RealView: Select the timer IRQ at run-time

Browse Source 
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>
This commit is contained in:
Catalin Marinas
2008-02-04 17:43:02 +01:00
committed by Russell King
parent c4057f5260
commit 8cc4c5488a
3 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
arch/arm/mach-realview/core.c
View File

@@ -39,7 +39,6 @@
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/flash.h> #include <asm/mach/flash.h>
#include <asm/mach/irq.h> #include <asm/mach/irq.h>
#include <asm/mach/time.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <asm/mach/mmc.h> #include <asm/mach/mmc.h>
@@ -513,12 +512,12 @@ static struct clock_event_device timer0_clockevent = {
.set_mode = timer_set_mode, .set_mode = timer_set_mode,
.set_next_event = timer_set_next_event, .set_next_event = timer_set_next_event,
.rating = 300, .rating = 300,
.irq = IRQ_TIMERINT0_1,
.cpumask = CPU_MASK_ALL, .cpumask = CPU_MASK_ALL,
}; };
static void __init realview_clockevents_init(void) static void __init realview_clockevents_init(unsigned int timer_irq)
{ {
timer0_clockevent.irq = timer_irq;
timer0_clockevent.mult = timer0_clockevent.mult =
div_sc(1000000, NSEC_PER_SEC, timer0_clockevent.shift); div_sc(1000000, NSEC_PER_SEC, timer0_clockevent.shift);
timer0_clockevent.max_delta_ns = timer0_clockevent.max_delta_ns =
@@ -581,7 +580,7 @@ static void __init realview_clocksource_init(void)
/* /*
* Set up the clock source and clock events devices * Set up the clock source and clock events devices
*/ */
static void __init realview_timer_init(void) void __init realview_timer_init(unsigned int timer_irq)
{ {
u32 val; u32 val;
@@ -616,12 +615,8 @@ static void __init realview_timer_init(void)
/* /*
* Make irqs happen for the system timer * Make irqs happen for the system timer
*/ */
setup_irq(IRQ_TIMERINT0_1, &realview_timer_irq); setup_irq(timer_irq, &realview_timer_irq);
realview_clocksource_init(); realview_clocksource_init();
realview_clockevents_init(); realview_clockevents_init(timer_irq);
} }
struct sys_timer realview_timer = {
.init = realview_timer_init,
};

3
arch/arm/mach-realview/core.h
View File

@@ -27,8 +27,6 @@
#include <asm/leds.h> #include <asm/leds.h>
#include <asm/io.h> #include <asm/io.h>
extern struct sys_timer realview_timer;
#define AMBA_DEVICE(name,busid,base,plat) \ #define AMBA_DEVICE(name,busid,base,plat) \
static struct amba_device name##_device = { \ static struct amba_device name##_device = { \
.dev = { \ .dev = { \
@@ -55,5 +53,6 @@ extern struct clcd_board clcd_plat_data;
extern void __iomem *gic_cpu_base_addr; extern void __iomem *gic_cpu_base_addr;
extern void realview_leds_event(led_event_t ledevt); extern void realview_leds_event(led_event_t ledevt);
extern void realview_timer_init(unsigned int timer_irq);
#endif #endif

19
arch/arm/mach-realview/realview_eb.c
View File

@@ -36,6 +36,7 @@
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <asm/mach/mmc.h> #include <asm/mach/mmc.h>
#include <asm/mach/time.h>
#include <asm/arch/board-eb.h> #include <asm/arch/board-eb.h>
#include <asm/arch/irqs.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; 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) static void __init realview_eb_init(void)
{ {
int i; int i;
@@ -339,6 +356,6 @@ MACHINE_START(REALVIEW_EB, "ARM-RealView EB")
.boot_params = 0x00000100, .boot_params = 0x00000100,
.map_io = realview_eb_map_io, .map_io = realview_eb_map_io,
.init_irq = gic_init_irq, .init_irq = gic_init_irq,
.timer = &realview_timer, .timer = &realview_eb_timer,
.init_machine = realview_eb_init, .init_machine = realview_eb_init,
MACHINE_END MACHINE_END