summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteffen Trumtrar <s.trumtrar@pengutronix.de>2013-06-25 20:05:24 (GMT)
committerMichal Simek <michal.simek@xilinx.com>2014-02-05 14:57:00 (GMT)
commit6f69c7f21ce89409ccc54bd596434fa61d5b26ff (patch)
treec5b7fad09a3622dd5225a4472364fcacc84f24fe
parent3795e91d2abb25164dda5687ca680a7ab940c447 (diff)
downloadlinux-6f69c7f21ce89409ccc54bd596434fa61d5b26ff.tar.xz
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>
-rw-r--r--arch/arm/mach-zynq/common.c2
-rw-r--r--arch/arm/mach-zynq/slcr.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c
index 1db2a5ca..bf6717f 100644
--- a/arch/arm/mach-zynq/common.c
+++ b/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();
}
diff --git a/arch/arm/mach-zynq/slcr.c b/arch/arm/mach-zynq/slcr.c
index 1836d5a..59ad09f 100644
--- a/arch/arm/mach-zynq/slcr.c
+++ b/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;