aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m68k/platform/5249/config.c
diff options
context:
space:
mode:
authorGreg Ungerer <gerg@uclinux.org>2011-12-23 23:36:27 -0500
committerGreg Ungerer <gerg@uclinux.org>2012-03-04 18:43:10 -0500
commit440f6ffc061a84e81386a093c07af8a429c18702 (patch)
treea5c202d9b43364b57acbef2e9e745c78c8d1b79e /arch/m68k/platform/5249/config.c
parentc05793c7332d0f4179068bc6a6120e67b73a09ef (diff)
m68knommu: move old ColdFire timers init from CPU init to timers code
The original ColdFire timer interrupt setup is used by most of the users of the original ColdFire timer code. But the code is currently duplicated in each of the ColdFire CPU specific init files. Move it to the timers code that it is really part of. It is strait forward to make it conditional on also having the original interrupt engine that it needs. Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Diffstat (limited to 'arch/m68k/platform/5249/config.c')
-rw-r--r--arch/m68k/platform/5249/config.c18
1 files changed, 0 insertions, 18 deletions
diff --git a/arch/m68k/platform/5249/config.c b/arch/m68k/platform/5249/config.c
index d00e12a378cc..cda273383226 100644
--- a/arch/m68k/platform/5249/config.c
+++ b/arch/m68k/platform/5249/config.c
@@ -83,23 +83,6 @@ static void __init m5249_smc91x_init(void)
83 83
84/***************************************************************************/ 84/***************************************************************************/
85 85
86static void __init m5249_timers_init(void)
87{
88 /* Timer1 is always used as system timer */
89 writeb(MCFSIM_ICR_AUTOVEC | MCFSIM_ICR_LEVEL6 | MCFSIM_ICR_PRI3,
90 MCF_MBAR + MCFSIM_TIMER1ICR);
91 mcf_mapirq2imr(MCF_IRQ_TIMER, MCFINTC_TIMER1);
92
93#ifdef CONFIG_HIGHPROFILE
94 /* Timer2 is to be used as a high speed profile timer */
95 writeb(MCFSIM_ICR_AUTOVEC | MCFSIM_ICR_LEVEL7 | MCFSIM_ICR_PRI3,
96 MCF_MBAR + MCFSIM_TIMER2ICR);
97 mcf_mapirq2imr(MCF_IRQ_PROFILER, MCFINTC_TIMER2);
98#endif
99}
100
101/***************************************************************************/
102
103void m5249_cpu_reset(void) 86void m5249_cpu_reset(void)
104{ 87{
105 local_irq_disable(); 88 local_irq_disable();
@@ -115,7 +98,6 @@ void __init config_BSP(char *commandp, int size)
115{ 98{
116 mach_reset = m5249_cpu_reset; 99 mach_reset = m5249_cpu_reset;
117 mach_sched_init = hw_timer_init; 100 mach_sched_init = hw_timer_init;
118 m5249_timers_init();
119#ifdef CONFIG_M5249C3 101#ifdef CONFIG_M5249C3
120 m5249_smc91x_init(); 102 m5249_smc91x_init();
121#endif 103#endif