Skip to content

Commit

Permalink
m68knommu: cleanup 68328 timer code
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Greg Ungerer authored and Linus Torvalds committed Oct 24, 2007
1 parent 0e298eb commit 8467571
Showing 1 changed file with 15 additions and 12 deletions.
27 changes: 15 additions & 12 deletions arch/m68knommu/platform/68328/timers.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand All @@ -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;

Expand Down

0 comments on commit 8467571

Please sign in to comment.