aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-zynq/common.c
diff options
context:
space:
mode:
authorJosh Cartwright <josh.cartwright@ni.com>2012-10-31 13:11:59 -0400
committerMichal Simek <michal.simek@xilinx.com>2012-11-05 07:38:32 -0500
commit03e07595febc4857b2b6ad756826f369c7628ec8 (patch)
tree1532f572448707fff745c56632f047ba7b3edb8c /arch/arm/mach-zynq/common.c
parentf58007762f537ba13674a3138b3f4c20fff1cba9 (diff)
ARM: zynq: move arm-specific sys_timer out of ttc
Move the sys_timer definition out of ttc driver and make it part of the common zynq code. This is preparation for renaming and COMMON_CLK support. Signed-off-by: Josh Cartwright <josh.cartwright@ni.com> Tested-by: Michal Simek <michal.simek@xilinx.com>
Diffstat (limited to 'arch/arm/mach-zynq/common.c')
-rw-r--r--arch/arm/mach-zynq/common.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c
index ba8d14f78d4d..6f058258b491 100644
--- a/arch/arm/mach-zynq/common.c
+++ b/arch/arm/mach-zynq/common.c
@@ -25,6 +25,7 @@
25 25
26#include <asm/mach/arch.h> 26#include <asm/mach/arch.h>
27#include <asm/mach/map.h> 27#include <asm/mach/map.h>
28#include <asm/mach/time.h>
28#include <asm/mach-types.h> 29#include <asm/mach-types.h>
29#include <asm/page.h> 30#include <asm/page.h>
30#include <asm/hardware/gic.h> 31#include <asm/hardware/gic.h>
@@ -93,6 +94,18 @@ static struct map_desc io_desc[] __initdata = {
93 94
94}; 95};
95 96
97static void __init xilinx_zynq_timer_init(void)
98{
99 xttcpss_timer_init();
100}
101
102/*
103 * Instantiate and initialize the system timer structure
104 */
105static struct sys_timer xttcpss_sys_timer = {
106 .init = xilinx_zynq_timer_init,
107};
108
96/** 109/**
97 * xilinx_map_io() - Create memory mappings needed for early I/O. 110 * xilinx_map_io() - Create memory mappings needed for early I/O.
98 */ 111 */