diff options
| author | Steffen Trumtrar <s.trumtrar@pengutronix.de> | 2013-06-26 00:05:24 +0400 |
|---|---|---|
| committer | Michal Simek <michal.simek@xilinx.com> | 2014-02-05 18:57:00 +0400 |
| commit | 6f69c7f21ce89409ccc54bd596434fa61d5b26ff (patch) | |
| tree | c5b7fad09a3622dd5225a4472364fcacc84f24fe /arch/arm/mach-zynq | |
| parent | 3795e91d2abb25164dda5687ca680a7ab940c447 (diff) | |
| download | linux-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>
Diffstat (limited to 'arch/arm/mach-zynq')
| -rw-r--r-- | arch/arm/mach-zynq/common.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-zynq/slcr.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c index 1db2a5ca9ab8..bf6717f5cd3c 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 1836d5a34606..59ad09ff3bc0 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; |