From 03fe0d3c27ed37d936eaa61e10ce56f8b15361a7 Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Mon, 27 Jan 2014 10:41:59 +0100 Subject: [PATCH] microblaze: timer: Do not initialized system timer twice Only one system timer can be setup. Do not initialize more system timers. Signed-off-by: Michal Simek --- arch/microblaze/kernel/timer.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/arch/microblaze/kernel/timer.c b/arch/microblaze/kernel/timer.c index 06609e01f1cf..fb0c61443f19 100644 --- a/arch/microblaze/kernel/timer.c +++ b/arch/microblaze/kernel/timer.c @@ -230,9 +230,15 @@ static int __init xilinx_clocksource_init(void) static void __init xilinx_timer_init(struct device_node *timer) { struct clk *clk; + static int initialized; u32 irq; u32 timer_num = 1; + if (initialized) + return; + + initialized = 1; + timer_baseaddr = of_iomap(timer, 0); if (!timer_baseaddr) { pr_err("ERROR: invalid timer base address\n"); -- 2.20.1