projects
/
platform
/
kernel
/
linux-exynos.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
839396a
)
microblaze: timer: Do not initialized system timer twice
author
Michal Simek
<michal.simek@xilinx.com>
Mon, 27 Jan 2014 09:41:59 +0000
(10:41 +0100)
committer
Michal Simek
<michal.simek@xilinx.com>
Mon, 27 Jan 2014 10:26:31 +0000
(11:26 +0100)
Only one system timer can be setup.
Do not initialize more system timers.
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
arch/microblaze/kernel/timer.c
patch
|
blob
|
history
diff --git
a/arch/microblaze/kernel/timer.c
b/arch/microblaze/kernel/timer.c
index
06609e0
..
fb0c614
100644
(file)
--- 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");