summaryrefslogtreecommitdiff
path: root/arch/microblaze
diff options
context:
space:
mode:
authorMichal Simek <michal.simek@xilinx.com>2018-07-11 14:08:26 +0200
committerMichal Simek <michal.simek@xilinx.com>2018-07-19 10:49:54 +0200
commit35670665d6b6176566b5701c078d5103c1ec4c86 (patch)
tree5428a662190d3896c3447767c7ae7dcc9ab29a2a /arch/microblaze
parent0df9bea4340ae64ec82004852ab325e869c371b8 (diff)
microblaze: Do not call timer init that early
Timer needs to be converted to DM but as of now it can't be called so early because intc controller is not ready. Call it later in board_r.c. Before this patch timer_init is called twice which is wrong. The patch is blocking initialization before relocation. Signed-off-by: Michal Simek <michal.simek@xilinx.com> Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch/microblaze')
-rw-r--r--arch/microblaze/cpu/timer.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/microblaze/cpu/timer.c b/arch/microblaze/cpu/timer.c
index ef229023bf..58e5c30750 100644
--- a/arch/microblaze/cpu/timer.c
+++ b/arch/microblaze/cpu/timer.c
@@ -51,6 +51,10 @@ int timer_init (void)
debug("TIMER: Initialization\n");
+ /* Do not init before relocation */
+ if (!(gd->flags & GD_FLG_RELOC))
+ return 0;
+
node = fdt_node_offset_by_compatible(blob, node,
"xlnx,xps-timer-1.00.a");
if (node != -1) {