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

[ARM] 4821/1: RealView: Remove the platform dependencies from localtimer.c

Browse Source 
This patch removes the TWD_BASE macro used to set up and configure the
local timers on ARM11MPCore. The twd_base_addr and twd_size variables
are defined in localtimer.c and set from the realview_eb_init function.

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:45:03 +01:00
committed by Russell King
parent 8cc4c5488a
commit 39e823e35b
3 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -51,6 +51,10 @@ extern struct mmc_platform_data realview_mmc1_plat_data;
extern struct clk realview_clcd_clk; extern struct clk realview_clcd_clk;
extern struct clcd_board clcd_plat_data; extern struct clcd_board clcd_plat_data;
extern void __iomem *gic_cpu_base_addr; extern void __iomem *gic_cpu_base_addr;
#ifdef CONFIG_LOCAL_TIMERS
extern void __iomem *twd_base_addr;
extern unsigned int twd_size;
#endif
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); extern void realview_timer_init(unsigned int timer_irq);

9
arch/arm/mach-realview/localtimer.c
View File

@@ -24,9 +24,6 @@
#include <asm/io.h> #include <asm/io.h>
#include <asm/irq.h> #include <asm/irq.h>
#define TWD_BASE(cpu) (__io_address(REALVIEW_EB11MP_TWD_BASE) + \
((cpu) * REALVIEW_EB11MP_TWD_SIZE))
static DEFINE_PER_CPU(struct clock_event_device, local_clockevent); static DEFINE_PER_CPU(struct clock_event_device, local_clockevent);
/* /*
@@ -41,6 +38,12 @@ void local_timer_interrupt(void)
#ifdef CONFIG_LOCAL_TIMERS #ifdef CONFIG_LOCAL_TIMERS
#define TWD_BASE(cpu) (twd_base_addr + (cpu) * twd_size)
/* set up by the platform code */
void __iomem *twd_base_addr;
unsigned int twd_size;
static unsigned long mpcore_timer_rate; static unsigned long mpcore_timer_rate;
static void local_timer_set_mode(enum clock_event_mode mode, static void local_timer_set_mode(enum clock_event_mode mode,

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

@@ -309,9 +309,13 @@ static void __init realview_eb_timer_init(void)
{ {
unsigned int timer_irq; unsigned int timer_irq;
if (core_tile_eb11mp()) if (core_tile_eb11mp()) {
#ifdef CONFIG_LOCAL_TIMERS
twd_base_addr = __io_address(REALVIEW_EB11MP_TWD_BASE);
twd_size = REALVIEW_EB11MP_TWD_SIZE;
#endif
timer_irq = IRQ_EB11MP_TIMER0_1; timer_irq = IRQ_EB11MP_TIMER0_1;
else } else
timer_irq = IRQ_EB_TIMER0_1; timer_irq = IRQ_EB_TIMER0_1;
realview_timer_init(timer_irq); realview_timer_init(timer_irq);