renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-03 19:24:02 +08:00
Code

ARM: mxc: Add dummy_get_cycles to avoid access before init is done

Browse Source 
this is needed to use get_cycles with sched_clock. Accessing timer
without enabled clk will result in crash

Signed-off-by: Jan Weitzel <j.weitzel@phytec.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Jan Weitzel 2011-03-17 13:44:29 +01:00 committed by Sascha Hauer
parent 350ac9ddce
commit 93b20e4fdb
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arch/arm/plat-mxc/time.c
View File

@ -105,6 +105,11 @@ static void gpt_irq_acknowledge(void)
__raw_writel(V2_TSTAT_OF1, timer_base + V2_TSTAT); __raw_writel(V2_TSTAT_OF1, timer_base + V2_TSTAT);
} }
static cycle_t dummy_get_cycles(struct clocksource *cs)
{
return 0;
}
static cycle_t mx1_2_get_cycles(struct clocksource *cs) static cycle_t mx1_2_get_cycles(struct clocksource *cs)
{ {
return __raw_readl(timer_base + MX1_2_TCN); return __raw_readl(timer_base + MX1_2_TCN);
@ -118,7 +123,7 @@ static cycle_t v2_get_cycles(struct clocksource *cs)
static struct clocksource clocksource_mxc = { static struct clocksource clocksource_mxc = {
.name = "mxc_timer1", .name = "mxc_timer1",
.rating = 200, .rating = 200,
.read = mx1_2_get_cycles, .read = dummy_get_cycles,
.mask = CLOCKSOURCE_MASK(32), .mask = CLOCKSOURCE_MASK(32),
.flags = CLOCK_SOURCE_IS_CONTINUOUS, .flags = CLOCK_SOURCE_IS_CONTINUOUS,
}; };
@ -129,6 +134,8 @@ static int __init mxc_clocksource_init(struct clk *timer_clk)
if (timer_is_v2()) if (timer_is_v2())
clocksource_mxc.read = v2_get_cycles; clocksource_mxc.read = v2_get_cycles;
else
clocksource_mxc.read = mx1_2_get_cycles;
clocksource_register_hz(&clocksource_mxc, c); clocksource_register_hz(&clocksource_mxc, c);