openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

clockevents: ARM sp804: allow clockevent name to be specified 

This allows platforms to specify the clcokevent name upon registration.

Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Russell King 2011-05-12 15:31:13 +01:00
parent 7ff550de99
commit 57cc4f7de2
7 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arch/arm/common/timer-sp.c
View File

@ -139,7 +139,6 @@ static int sp804_set_next_event(unsigned long next,
} }
static struct clock_event_device sp804_clockevent = { static struct clock_event_device sp804_clockevent = {
.name = "timer0",
.shift = 32, .shift = 32,
.features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT, .features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,
.set_mode = sp804_set_mode, .set_mode = sp804_set_mode,
@ -155,17 +154,19 @@ static struct irqaction sp804_timer_irq = {
.dev_id = &sp804_clockevent, .dev_id = &sp804_clockevent,
}; };
void __init sp804_clockevents_init(void __iomem *base, unsigned int timer_irq) void __init sp804_clockevents_init(void __iomem *base, unsigned int irq,
const char *name)
{ {
struct clock_event_device *evt = &sp804_clockevent; struct clock_event_device *evt = &sp804_clockevent;
clkevt_base = base; clkevt_base = base;
evt->irq = timer_irq; evt->name = name;
evt->irq = irq;
evt->mult = div_sc(TIMER_FREQ_KHZ, NSEC_PER_MSEC, evt->shift); evt->mult = div_sc(TIMER_FREQ_KHZ, NSEC_PER_MSEC, evt->shift);
evt->max_delta_ns = clockevent_delta2ns(0xffffffff, evt); evt->max_delta_ns = clockevent_delta2ns(0xffffffff, evt);
evt->min_delta_ns = clockevent_delta2ns(0xf, evt); evt->min_delta_ns = clockevent_delta2ns(0xf, evt);
setup_irq(timer_irq, &sp804_timer_irq); setup_irq(irq, &sp804_timer_irq);
clockevents_register_device(evt); clockevents_register_device(evt);
} }

2
arch/arm/include/asm/hardware/timer-sp.h
View File

@ -1,2 +1,2 @@
void sp804_clocksource_init(void __iomem *, const char *); void sp804_clocksource_init(void __iomem *, const char *);
void sp804_clockevents_init(void __iomem *, unsigned int); void sp804_clockevents_init(void __iomem *, unsigned int, const char *);

2
arch/arm/mach-integrator/integrator_cp.c
View File

@ -484,7 +484,7 @@ static void __init intcp_timer_init(void)
writel(0, TIMER2_VA_BASE + TIMER_CTRL); writel(0, TIMER2_VA_BASE + TIMER_CTRL);
sp804_clocksource_init(TIMER2_VA_BASE, "timer2"); sp804_clocksource_init(TIMER2_VA_BASE, "timer2");
sp804_clockevents_init(TIMER1_VA_BASE, IRQ_TIMERINT1); sp804_clockevents_init(TIMER1_VA_BASE, IRQ_TIMERINT1, "timer1");
} }
static struct sys_timer cp_timer = { static struct sys_timer cp_timer = {

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

@ -553,7 +553,7 @@ void __init realview_timer_init(unsigned int timer_irq)
writel(0, timer3_va_base + TIMER_CTRL); writel(0, timer3_va_base + TIMER_CTRL);
sp804_clocksource_init(timer3_va_base, "timer3"); sp804_clocksource_init(timer3_va_base, "timer3");
sp804_clockevents_init(timer0_va_base, timer_irq); sp804_clockevents_init(timer0_va_base, timer_irq, "timer0");
} }
/* /*

2
arch/arm/mach-versatile/core.c
View File

@ -772,7 +772,7 @@ static void __init versatile_timer_init(void)
writel(0, TIMER3_VA_BASE + TIMER_CTRL); writel(0, TIMER3_VA_BASE + TIMER_CTRL);
sp804_clocksource_init(TIMER3_VA_BASE, "timer3"); sp804_clocksource_init(TIMER3_VA_BASE, "timer3");
sp804_clockevents_init(TIMER0_VA_BASE, IRQ_TIMERINT0_1); sp804_clockevents_init(TIMER0_VA_BASE, IRQ_TIMERINT0_1, "timer0");
} }
struct sys_timer versatile_timer = { struct sys_timer versatile_timer = {

3
arch/arm/mach-vexpress/ct-ca9x4.c
View File

@ -72,7 +72,8 @@ static void __init ct_ca9x4_timer_init(void)
writel(0, MMIO_P2V(CT_CA9X4_TIMER1) + TIMER_CTRL); writel(0, MMIO_P2V(CT_CA9X4_TIMER1) + TIMER_CTRL);
sp804_clocksource_init(MMIO_P2V(CT_CA9X4_TIMER1), "ct-timer1"); sp804_clocksource_init(MMIO_P2V(CT_CA9X4_TIMER1), "ct-timer1");
sp804_clockevents_init(MMIO_P2V(CT_CA9X4_TIMER0), IRQ_CT_CA9X4_TIMER0); sp804_clockevents_init(MMIO_P2V(CT_CA9X4_TIMER0), IRQ_CT_CA9X4_TIMER0,
"ct-timer0");
} }
static struct sys_timer ct_ca9x4_timer = { static struct sys_timer ct_ca9x4_timer = {

3
arch/arm/mach-vexpress/v2m.c
View File

@ -66,7 +66,8 @@ static void __init v2m_timer_init(void)
writel(0, MMIO_P2V(V2M_TIMER1) + TIMER_CTRL); writel(0, MMIO_P2V(V2M_TIMER1) + TIMER_CTRL);
sp804_clocksource_init(MMIO_P2V(V2M_TIMER1), "v2m-timer1"); sp804_clocksource_init(MMIO_P2V(V2M_TIMER1), "v2m-timer1");
sp804_clockevents_init(MMIO_P2V(V2M_TIMER0), IRQ_V2M_TIMER0); sp804_clockevents_init(MMIO_P2V(V2M_TIMER0), IRQ_V2M_TIMER0,
"v2m-timer0");
} }
static struct sys_timer v2m_timer = { static struct sys_timer v2m_timer = {