diff options
| author | Josh Cartwright <josh.cartwright@ni.com> | 2012-10-31 11:11:59 -0600 |
|---|---|---|
| committer | Michal Simek <michal.simek@xilinx.com> | 2012-11-05 13:38:32 +0100 |
| commit | 03e07595febc4857b2b6ad756826f369c7628ec8 (patch) | |
| tree | 1532f572448707fff745c56632f047ba7b3edb8c /arch/arm/mach-zynq/timer.c | |
| parent | f58007762f537ba13674a3138b3f4c20fff1cba9 (diff) | |
| download | linux-stable-03e07595febc4857b2b6ad756826f369c7628ec8.tar.gz linux-stable-03e07595febc4857b2b6ad756826f369c7628ec8.tar.bz2 linux-stable-03e07595febc4857b2b6ad756826f369c7628ec8.zip | |
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/timer.c')
| -rw-r--r-- | arch/arm/mach-zynq/timer.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/arch/arm/mach-zynq/timer.c b/arch/arm/mach-zynq/timer.c index c2c96cc7d6e7..c93cbe55a495 100644 --- a/arch/arm/mach-zynq/timer.c +++ b/arch/arm/mach-zynq/timer.c @@ -24,7 +24,6 @@ #include <linux/clockchips.h> #include <linux/io.h> -#include <asm/mach/time.h> #include <mach/zynq_soc.h> #include "common.h" @@ -269,7 +268,7 @@ static struct clock_event_device xttcpss_clockevent = { * Initializes the timer hardware and register the clock source and clock event * timers with Linux kernal timer framework **/ -static void __init xttcpss_timer_init(void) +void __init xttcpss_timer_init(void) { xttcpss_timer_hardware_init(); clocksource_register_hz(&clocksource_xttcpss, TIMER_RATE); @@ -289,10 +288,3 @@ static void __init xttcpss_timer_init(void) xttcpss_clockevent.cpumask = cpumask_of(0); clockevents_register_device(&xttcpss_clockevent); } - -/* - * Instantiate and initialize the system timer structure - */ -struct sys_timer xttcpss_sys_timer = { - .init = xttcpss_timer_init, -}; |