Skip to content

Commit

Permalink
ARM: mxc: Add dummy_get_cycles to avoid access before init is done
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jan Weitzel authored and Sascha Hauer committed Mar 23, 2011
1 parent 350ac9d commit 93b20e4
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion arch/arm/plat-mxc/time.c
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,11 @@ static void gpt_irq_acknowledge(void)
__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)
{
return __raw_readl(timer_base + MX1_2_TCN);
Expand All @@ -118,7 +123,7 @@ static cycle_t v2_get_cycles(struct clocksource *cs)
static struct clocksource clocksource_mxc = {
.name = "mxc_timer1",
.rating = 200,
.read = mx1_2_get_cycles,
.read = dummy_get_cycles,
.mask = CLOCKSOURCE_MASK(32),
.flags = CLOCK_SOURCE_IS_CONTINUOUS,
};
Expand All @@ -129,6 +134,8 @@ static int __init mxc_clocksource_init(struct clk *timer_clk)

if (timer_is_v2())
clocksource_mxc.read = v2_get_cycles;
else
clocksource_mxc.read = mx1_2_get_cycles;

clocksource_register_hz(&clocksource_mxc, c);

Expand Down

0 comments on commit 93b20e4

Please sign in to comment.