Browse Source

ARM: zynq: Move clock_init from slcr to common

Preparation step for next changes.

Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Steffen Trumtrar 12 years ago
parent
commit
6f69c7f21c
2 changed files with 2 additions and 2 deletions
  1. 2 0
      arch/arm/mach-zynq/common.c
  2. 0 2
      arch/arm/mach-zynq/slcr.c

+ 2 - 0
arch/arm/mach-zynq/common.c

@@ -64,6 +64,8 @@ static void __init zynq_init_machine(void)
 static void __init zynq_timer_init(void)
 {
 	zynq_slcr_init();
+
+	zynq_clock_init(zynq_slcr_base);
 	clocksource_of_init();
 }
 

+ 0 - 2
arch/arm/mach-zynq/slcr.c

@@ -106,8 +106,6 @@ int __init zynq_slcr_init(void)
 
 	pr_info("%s mapped to %p\n", np->name, zynq_slcr_base);
 
-	zynq_clock_init(zynq_slcr_base);
-
 	of_node_put(np);
 
 	return 0;