|
@@ -34,7 +34,6 @@
|
|
|
* These provide the underlying interrupt vector support.
|
|
|
* Unfortunately it is a little different on each ColdFire.
|
|
|
*/
|
|
|
-extern void mcf_settimericr(int timer, int level);
|
|
|
void coldfire_profile_init(void);
|
|
|
|
|
|
#if defined(CONFIG_M532x)
|
|
@@ -98,8 +97,6 @@ static struct clocksource mcftmr_clk = {
|
|
|
|
|
|
void hw_timer_init(void)
|
|
|
{
|
|
|
- setup_irq(MCF_IRQ_TIMER, &mcftmr_timer_irq);
|
|
|
-
|
|
|
__raw_writew(MCFTIMER_TMR_DISABLE, TA(MCFTIMER_TMR));
|
|
|
mcftmr_cycles_per_jiffy = FREQ / HZ;
|
|
|
/*
|
|
@@ -115,7 +112,7 @@ void hw_timer_init(void)
|
|
|
mcftmr_clk.mult = clocksource_hz2mult(FREQ, mcftmr_clk.shift);
|
|
|
clocksource_register(&mcftmr_clk);
|
|
|
|
|
|
- mcf_clrimr(MCFINTC_TIMER1);
|
|
|
+ setup_irq(MCF_IRQ_TIMER, &mcftmr_timer_irq);
|
|
|
|
|
|
#ifdef CONFIG_HIGHPROFILE
|
|
|
coldfire_profile_init();
|
|
@@ -162,8 +159,6 @@ void coldfire_profile_init(void)
|
|
|
printk(KERN_INFO "PROFILE: lodging TIMER2 @ %dHz as profile timer\n",
|
|
|
PROFILEHZ);
|
|
|
|
|
|
- setup_irq(MCF_IRQ_PROFILER, &coldfire_profile_irq);
|
|
|
-
|
|
|
/* Set up TIMER 2 as high speed profile clock */
|
|
|
__raw_writew(MCFTIMER_TMR_DISABLE, PA(MCFTIMER_TMR));
|
|
|
|
|
@@ -171,7 +166,7 @@ void coldfire_profile_init(void)
|
|
|
__raw_writew(MCFTIMER_TMR_ENORI | MCFTIMER_TMR_CLK16 |
|
|
|
MCFTIMER_TMR_RESTART | MCFTIMER_TMR_ENABLE, PA(MCFTIMER_TMR));
|
|
|
|
|
|
- mcf_clrimr(MCFINTC_TIMER2);
|
|
|
+ setup_irq(MCF_IRQ_PROFILER, &coldfire_profile_irq);
|
|
|
}
|
|
|
|
|
|
/***************************************************************************/
|