lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

microblaze: timer: Do not initialized system timer twice

Browse Source 
Only one system timer can be setup.
Do not initialize more system timers.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
This commit is contained in:
Michal Simek
2014-01-27 10:41:59 +01:00
parent 839396ab88
commit 03fe0d3c27
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
arch/microblaze/kernel/timer.c
View File

@@ -230,9 +230,15 @@ static int __init xilinx_clocksource_init(void)
static void __init xilinx_timer_init(struct device_node *timer) static void __init xilinx_timer_init(struct device_node *timer)
{ {
struct clk *clk; struct clk *clk;
static int initialized;
u32 irq; u32 irq;
u32 timer_num = 1; u32 timer_num = 1;
if (initialized)
return;
initialized = 1;
timer_baseaddr = of_iomap(timer, 0); timer_baseaddr = of_iomap(timer, 0);
if (!timer_baseaddr) { if (!timer_baseaddr) {
pr_err("ERROR: invalid timer base address\n"); pr_err("ERROR: invalid timer base address\n");