Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fb593cf3 authored by Russell King's avatar Russell King
Browse files

clocksource: ARM sp804: allow clocksource name to be specified 



This allows platforms to specify the clocksource name upon
registration, which is necessary should they wish to register more
than one sp804 clocksource.

Acked-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 933e54a5

arch/arm/common/timer-sp.c

+2 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
#define TIMER_FREQ_KHZ	(1000)

#define TIMER_RELOAD	(TIMER_FREQ_KHZ * 1000 / HZ)



void __init sp804_clocksource_init(void __iomem *base)

void __init sp804_clocksource_init(void __iomem *base, const char *name)

{

	/* setup timer 0 as free-running clocksource */

	writel(0, base + TIMER_CTRL);
@@ -41,7 +41,7 @@ void __init sp804_clocksource_init(void __iomem *base) 
	writel(TIMER_CTRL_32BIT | TIMER_CTRL_ENABLE | TIMER_CTRL_PERIODIC,

		base + TIMER_CTRL);



	clocksource_mmio_init(base + TIMER_VALUE, "timer3",

	clocksource_mmio_init(base + TIMER_VALUE, name,

		TIMER_FREQ_KHZ * 1000, 200, 32, clocksource_mmio_readl_down);

}

arch/arm/include/asm/hardware/timer-sp.h

+1 −1
Original line number Diff line number Diff line 
void sp804_clocksource_init(void __iomem *);

void sp804_clocksource_init(void __iomem *, const char *);

void sp804_clockevents_init(void __iomem *, unsigned int);

arch/arm/mach-integrator/integrator_cp.c

+1 −1
Original line number Diff line number Diff line
@@ -476,7 +476,7 @@ static void __init intcp_timer_init(void) 
	writel(0, TIMER1_VA_BASE + TIMER_CTRL);

	writel(0, TIMER2_VA_BASE + TIMER_CTRL);



	sp804_clocksource_init(TIMER2_VA_BASE);

	sp804_clocksource_init(TIMER2_VA_BASE, "timer2");

	sp804_clockevents_init(TIMER1_VA_BASE, IRQ_TIMERINT1);

}

arch/arm/mach-realview/core.c

+1 −1
Original line number Diff line number Diff line
@@ -545,7 +545,7 @@ void __init realview_timer_init(unsigned int timer_irq) 
	writel(0, timer2_va_base + TIMER_CTRL);

	writel(0, timer3_va_base + TIMER_CTRL);



	sp804_clocksource_init(timer3_va_base);

	sp804_clocksource_init(timer3_va_base, "timer3");

	sp804_clockevents_init(timer0_va_base, timer_irq);

}

arch/arm/mach-versatile/core.c

+1 −1
Original line number Diff line number Diff line
@@ -764,7 +764,7 @@ static void __init versatile_timer_init(void) 
	writel(0, TIMER2_VA_BASE + TIMER_CTRL);

	writel(0, TIMER3_VA_BASE + TIMER_CTRL);



	sp804_clocksource_init(TIMER3_VA_BASE);

	sp804_clocksource_init(TIMER3_VA_BASE, "timer3");

	sp804_clockevents_init(TIMER0_VA_BASE, IRQ_TIMERINT0_1);

}