[PATCH] move common timer and vector code for m68knommu/ColdFire/5206e

This patch moves common ColdFire vector and timer procesing code from
the local per-processor config.c for the 5206e ColdFire sub-architecture.
All ColdFire CPU's have the same timer and basic vector setup, seems
crazy to repeat this code for each of 6 ColdFire CPU varients.
This patch also removes the reset button support, this is now moved to
a proper device driver, where it belongs.

arch/m68knommu/platform/5206e/config.c

@@ -20,17 +20,16 @@
 #include <asm/mcftimer.h>
 #include <asm/mcfsim.h>
 #include <asm/mcfdma.h>
-
-#ifdef CONFIG_NETtel
 #include <asm/irq.h>
 #include <asm/delay.h>
-#endif
 
 /***************************************************************************/
 
-#ifdef CONFIG_NETtel
-void	reset_setupbutton(void);
-#endif
+void coldfire_tick(void);
+void coldfire_timer_init(void (*handler)(int, void *, struct pt_regs *));
+unsigned long coldfire_timer_offset(void);
+void coldfire_trap_init(void);
+void coldfire_reset(void);
 
 /***************************************************************************/
 
@@ -42,53 +41,8 @@ unsigned int   dma_base_addr[MAX_M68K_DMA_CHANNELS] = {
         MCF_MBAR + MCFDMA_BASE1,
 };
 
-unsigned int dma_device_address[MAX_M68K_DMA_CHANNELS];
-
 /***************************************************************************/
 
-void coldfire_tick(void)
-{
-	volatile unsigned char	*timerp;
-
-	/* Reset the ColdFire timer */
-	timerp = (volatile unsigned char *) (MCF_MBAR + MCFTIMER_BASE1);
-	timerp[MCFTIMER_TER] = MCFTIMER_TER_CAP | MCFTIMER_TER_REF;
-}
-
-/***************************************************************************/
-
-void coldfire_timer_init(void (*handler)(int, void *, struct pt_regs *))
-{
-	volatile unsigned short	*timerp;
-	volatile unsigned char	*icrp;
-
-	/* Set up TIMER 1 as poll clock */
-	timerp = (volatile unsigned short *) (MCF_MBAR + MCFTIMER_BASE1);
-	timerp[MCFTIMER_TMR] = MCFTIMER_TMR_DISABLE;
-
-	timerp[MCFTIMER_TRR] = (unsigned short) ((MCF_CLK / 16) / HZ);
-	timerp[MCFTIMER_TMR] = MCFTIMER_TMR_ENORI | MCFTIMER_TMR_CLK16 |
-		MCFTIMER_TMR_RESTART | MCFTIMER_TMR_ENABLE;
-
-	icrp = (volatile unsigned char *) (MCF_MBAR + MCFSIM_TIMER1ICR);
-
-#ifdef CONFIG_NETtel
-	*icrp = MCFSIM_ICR_AUTOVEC | MCFSIM_ICR_LEVEL6 | MCFSIM_ICR_PRI3;
-	request_irq(30, handler, SA_INTERRUPT, "ColdFire Timer", NULL);
-	reset_setupbutton();
-#else
-	*icrp = MCFSIM_ICR_AUTOVEC | MCFSIM_ICR_LEVEL5 | MCFSIM_ICR_PRI3;
-	request_irq(29, handler, SA_INTERRUPT, "ColdFire Timer", NULL);
-#endif
-	mcf_setimr(mcf_getimr() & ~MCFSIM_IMR_TIMER1);
-}
-
-/***************************************************************************/
-
-/*
- *	Program the vector to be an auto-vectored.
- */
-
 void mcf_autovector(unsigned int vec)
 {
 	volatile unsigned char  *mbar;
@@ -106,117 +60,29 @@ void mcf_autovector(unsigned int vec)
 
 /***************************************************************************/
 
-extern e_vector	*_ramvec;
-
-void set_evector(int vecnum, void (*handler)(void))
-{
-	if (vecnum >= 0 && vecnum <= 255)
-		_ramvec[vecnum] = handler;
-}
-
-/***************************************************************************/
-
-/* assembler routines */
-asmlinkage void buserr(void);
-asmlinkage void trap(void);
-asmlinkage void system_call(void);
-asmlinkage void inthandler(void);
-
-void coldfire_trap_init(void)
+void mcf_settimericr(unsigned int timer, unsigned int level)
 {
-	int i;
-#ifdef MCF_MEMORY_PROTECT
-	extern unsigned long _end;
-	extern unsigned long memory_end;
-#endif
-
-#ifndef ENABLE_dBUG
-	mcf_setimr(MCFSIM_IMR_MASKALL);
-#endif
-
-	/*
-	 *	There is a common trap handler and common interrupt
-	 *	handler that handle almost every vector. We treat
-	 *	the system call and bus error special, they get their
-	 *	own first level handlers.
-	 */
-#ifndef ENABLE_dBUG
-	for (i = 3; (i <= 23); i++)
-		_ramvec[i] = trap;
-	for (i = 33; (i <= 63); i++)
-		_ramvec[i] = trap;
-#endif
-
-	for (i = 24; (i <= 30); i++)
-		_ramvec[i] = inthandler;
-#ifndef ENABLE_dBUG
-	_ramvec[31] = inthandler;  // Disables the IRQ7 button
-#endif
-
-	for (i = 64; (i < 255); i++)
-		_ramvec[i] = inthandler;
-	_ramvec[255] = 0;
-
-	_ramvec[2] = buserr;
-	_ramvec[32] = system_call;
-}
-
-/***************************************************************************/
-
-#ifdef CONFIG_NETtel
-
-/*
- *	Routines to support the NETtel software reset button.
- */
-void reset_button(int irq, void *dev_id, struct pt_regs *regs)
-{
-	extern void	flash_eraseconfig(void);
-	static int	inbutton = 0;
+	volatile unsigned char *icrp;
+	unsigned int icr, imr;
 
-	/*
-	 *	IRQ7 is not maskable by the CPU core. It is possible
-	 *	that switch bounce may get us back here before we have
-	 *	really serviced the interrupt.
-	 */
-	if (inbutton)
-		return;
-	inbutton = 1;
-	/* Disable interrupt at SIM - best we can do... */
-	mcf_setimr(mcf_getimr() | MCFSIM_IMR_EINT7);
-	/* Try and de-bounce the switch a little... */
-	udelay(10000);
-
-	flash_eraseconfig();
-
-	/* Don't leave here 'till button is no longer pushed! */
-	for (;;) {
-		if ((mcf_getipr() & MCFSIM_IMR_EINT7) == 0)
-			break;
+	if (timer <= 2) {
+		switch (timer) {
+		case 2:  icr = MCFSIM_TIMER2ICR; imr = MCFSIM_IMR_TIMER2; break;
+		default: icr = MCFSIM_TIMER1ICR; imr = MCFSIM_IMR_TIMER1; break;
 		}
 
-	HARD_RESET_NOW();
-	/* Should never get here... */
-
-	inbutton = 0;
-	/* Interrupt service done, enable it again */
-	mcf_setimr(mcf_getimr() & ~MCFSIM_IMR_EINT7);
-}
-
-/***************************************************************************/
-
-void reset_setupbutton(void)
-{
-	mcf_autovector(31);
-	request_irq(31, reset_button, (SA_INTERRUPT | IRQ_FLG_FAST),
-		"Reset Button", NULL);
+		icrp = (volatile unsigned char *) (MCF_MBAR + icr);
+		*icrp = MCFSIM_ICR_AUTOVEC | (level << 2) | MCFSIM_ICR_PRI3;
+		mcf_setimr(mcf_getimr() & ~imr);
+	}
 }
 
-#endif /* CONFIG_NETtel */
-
 /***************************************************************************/
 
 void config_BSP(char *commandp, int size)
 {
+	mcf_setimr(MCFSIM_IMR_MASKALL);
+
 #ifdef CONFIG_NETtel
 	/* Copy command line from FLASH to local buffer... */
 	memcpy(commandp, (char *) 0xf0004000, size);
@@ -227,7 +93,9 @@ void config_BSP(char *commandp, int size)
 
 	mach_sched_init = coldfire_timer_init;
 	mach_tick = coldfire_tick;
+	mach_gettimeoffset = coldfire_timer_offset;
 	mach_trap_init = coldfire_trap_init;
+	mach_reset = coldfire_reset;
 }
 
 /***************************************************************************/