diff options
| author | Josh Cartwright <josh.cartwright@ni.com> | 2012-10-31 17:11:59 (GMT) |
|---|---|---|
| committer | Michal Simek <michal.simek@xilinx.com> | 2012-11-05 12:38:32 (GMT) |
| commit | 03e07595febc4857b2b6ad756826f369c7628ec8 (patch) | |
| tree | 1532f572448707fff745c56632f047ba7b3edb8c /arch/arm/mach-zynq/common.c | |
| parent | f58007762f537ba13674a3138b3f4c20fff1cba9 (diff) | |
| download | linux-03e07595febc4857b2b6ad756826f369c7628ec8.tar.xz | |
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.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c index ba8d14f..6f058258 100644 --- a/arch/arm/mach-zynq/common.c +++ b/arch/arm/mach-zynq/common.c @@ -25,6 +25,7 @@ #include <asm/mach/arch.h> #include <asm/mach/map.h> +#include <asm/mach/time.h> #include <asm/mach-types.h> #include <asm/page.h> #include <asm/hardware/gic.h> @@ -93,6 +94,18 @@ static struct map_desc io_desc[] __initdata = { }; +static void __init xilinx_zynq_timer_init(void) +{ + xttcpss_timer_init(); +} + +/* + * Instantiate and initialize the system timer structure + */ +static struct sys_timer xttcpss_sys_timer = { + .init = xilinx_zynq_timer_init, +}; + /** * xilinx_map_io() - Create memory mappings needed for early I/O. */ |