From: Michal Simek <michal.simek@xilinx.com>
Date: Mon, 27 Jan 2014 09:41:59 +0000 (+0100)
Subject: microblaze: timer: Do not initialized system timer twice
X-Git-Tag: v3.14-rc1~73^2~5
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=03fe0d3c27ed37d936eaa61e10ce56f8b15361a7;p=linux.git

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>
---

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");