diff options
author | Jon Hunter <jon-hunter@ti.com> | 2013-04-01 22:47:29 +0400 |
---|---|---|
committer | Jon Hunter <jon-hunter@ti.com> | 2013-04-01 22:47:29 +0400 |
commit | 2d61aecee8f32259920cdf90a452fa26ffc64e9f (patch) | |
tree | 2311b6b4c12b946164e8cfb3422cebdfecf08f37 /arch/arm/mach-h720x/cpu-h7201.c | |
parent | 71856843fb1d8ee455a4c1a60696c74afa4809e5 (diff) | |
parent | 6bb27d7349db51b50c40534710fe164ca0d58902 (diff) | |
download | linux-2d61aecee8f32259920cdf90a452fa26ffc64e9f.tar.xz |
Merge commit '6bb27d7349db51b50c40534710fe164ca0d58902' into omap-timer-for-v3.10
Diffstat (limited to 'arch/arm/mach-h720x/cpu-h7201.c')
-rw-r--r-- | arch/arm/mach-h720x/cpu-h7201.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/arch/arm/mach-h720x/cpu-h7201.c b/arch/arm/mach-h720x/cpu-h7201.c index 24df2a349a98..13c741215387 100644 --- a/arch/arm/mach-h720x/cpu-h7201.c +++ b/arch/arm/mach-h720x/cpu-h7201.c @@ -44,8 +44,10 @@ static struct irqaction h7201_timer_irq = { /* * Setup TIMER0 as system timer */ -void __init h7201_init_time(void) +void __init h7201_timer_init(void) { + arch_gettimeoffset = h720x_gettimeoffset; + CPU_REG (TIMER_VIRT, TM0_PERIOD) = LATCH; CPU_REG (TIMER_VIRT, TM0_CTRL) = TM_RESET; CPU_REG (TIMER_VIRT, TM0_CTRL) = TM_REPEAT | TM_START; @@ -53,8 +55,3 @@ void __init h7201_init_time(void) setup_irq(IRQ_TIMER0, &h7201_timer_irq); } - -struct sys_timer h7201_timer = { - .init = h7201_init_time, - .offset = h720x_gettimeoffset, -}; |