diff options
author | Michal Simek <michal.simek@xilinx.com> | 2014-01-27 04:41:59 -0500 |
---|---|---|
committer | Michal Simek <michal.simek@xilinx.com> | 2014-01-27 05:26:31 -0500 |
commit | 03fe0d3c27ed37d936eaa61e10ce56f8b15361a7 (patch) | |
tree | 0c589f2628062a2af732d699665a987778351634 | |
parent | 839396ab88e4ac0107a88cb85fa59a7ec3f94416 (diff) |
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 <michal.simek@xilinx.com>
-rw-r--r-- | arch/microblaze/kernel/timer.c | 6 |
1 files changed, 6 insertions, 0 deletions
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) | |||
230 | static void __init xilinx_timer_init(struct device_node *timer) | 230 | static void __init xilinx_timer_init(struct device_node *timer) |
231 | { | 231 | { |
232 | struct clk *clk; | 232 | struct clk *clk; |
233 | static int initialized; | ||
233 | u32 irq; | 234 | u32 irq; |
234 | u32 timer_num = 1; | 235 | u32 timer_num = 1; |
235 | 236 | ||
237 | if (initialized) | ||
238 | return; | ||
239 | |||
240 | initialized = 1; | ||
241 | |||
236 | timer_baseaddr = of_iomap(timer, 0); | 242 | timer_baseaddr = of_iomap(timer, 0); |
237 | if (!timer_baseaddr) { | 243 | if (!timer_baseaddr) { |
238 | pr_err("ERROR: invalid timer base address\n"); | 244 | pr_err("ERROR: invalid timer base address\n"); |