diff options
| author | Greg Ungerer <gerg@snapgear.com> | 2007-10-24 12:03:20 +1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-23 20:45:44 -0700 |
| commit | 846757162d3f92629b3ab6189366cd8febbb4995 (patch) | |
| tree | f49534bd5429336c659236388045397c4655d3bf /arch | |
| parent | 0e298ebec4ddc84741340fb085887ad8732f727b (diff) | |
| download | blackbird-op-linux-846757162d3f92629b3ab6189366cd8febbb4995.tar.gz blackbird-op-linux-846757162d3f92629b3ab6189366cd8febbb4995.zip | |
m68knommu: cleanup 68328 timer code
Use common function naming for 68328 timer functions to make them
consistent with the various other hardware m68knommu timers.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/m68knommu/platform/68328/timers.c | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/arch/m68knommu/platform/68328/timers.c b/arch/m68knommu/platform/68328/timers.c index 0396476f955d..04cbc661d4bd 100644 --- a/arch/m68knommu/platform/68328/timers.c +++ b/arch/m68knommu/platform/68328/timers.c @@ -53,18 +53,28 @@ /***************************************************************************/ +static irqreturn_t hw_tick(int irq, void *dummy) +{ + /* Reset Timer1 */ + TSTAT &= 0; + + return arch_timer_interrupt(irq, dummy); +} + +/***************************************************************************/ + static struct irqaction m68328_timer_irq = { - .name = "timer", - .flags = IRQF_DISABLED | IRQF_TIMER, + .name = "timer", + .flags = IRQF_DISABLED | IRQF_TIMER, + .handler = hw_tick, }; -void m68328_timer_init(irq_handler_t timer_routine) +void hw_timer_init(void) { /* disable timer 1 */ TCTL = 0; /* set ISR */ - m68328_timer_irq.handler = timer_routine; setup_irq(TMR_IRQ_NUM, &m68328_timer_irq); /* Restart mode, Enable int, Set clock source */ @@ -78,14 +88,7 @@ void m68328_timer_init(irq_handler_t timer_routine) /***************************************************************************/ -void m68328_timer_tick(void) -{ - /* Reset Timer1 */ - TSTAT &= 0; -} -/***************************************************************************/ - -unsigned long m68328_timer_gettimeoffset(void) +unsigned long hw_timer_offset(void) { unsigned long ticks = TCN, offset = 0; |
