diff options
Diffstat (limited to 'lib_m68k/time.c')
| -rw-r--r-- | lib_m68k/time.c | 263 | 
1 files changed, 218 insertions, 45 deletions
| diff --git a/lib_m68k/time.c b/lib_m68k/time.c index 12e38f057..3dbce0721 100644 --- a/lib_m68k/time.c +++ b/lib_m68k/time.c @@ -26,6 +26,8 @@  #include <common.h>  #include <asm/mcftimer.h> +#include <asm/timer.h> +#include <asm/immap.h>  #ifdef	CONFIG_M5271  #include <asm/m5271.h> @@ -46,13 +48,13 @@  #include <asm/immap_5249.h>  #endif +DECLARE_GLOBAL_DATA_PTR;  static ulong timestamp;  #if defined(CONFIG_M5282) || defined(CONFIG_M5271)  static unsigned short lastinc;  #endif -  #if defined(CONFIG_M5272)  /*   * We use timer 3 which is running with a period of 1 us @@ -73,8 +75,10 @@ void udelay(unsigned long usec)  		timerp->timer_tmr = MCFTIMER_TMR_DISABLE;  		timerp->timer_tcn = 0;  		/* set period to 1 us */ -		timerp->timer_tmr = (((CFG_CLK / 1000000) - 1)	<< 8) | MCFTIMER_TMR_CLK1 | -				     MCFTIMER_TMR_FREERUN | MCFTIMER_TMR_ENABLE; +		timerp->timer_tmr = +		    (((CFG_CLK / 1000000) - +		      1) << 8) | MCFTIMER_TMR_CLK1 | MCFTIMER_TMR_FREERUN | +		    MCFTIMER_TMR_ENABLE;  		start = now = timerp->timer_tcn;  		while (now < start + tmp) @@ -82,7 +86,8 @@ void udelay(unsigned long usec)  	}  } -void mcf_timer_interrupt (void * not_used){ +void mcf_timer_interrupt(void *not_used) +{  	volatile timer_t *timerp = (timer_t *) (CFG_MBAR + MCFTIMER_BASE4);  	volatile intctrl_t *intp = (intctrl_t *) (CFG_MBAR + MCFSIM_ICR1); @@ -93,10 +98,11 @@ void mcf_timer_interrupt (void * not_used){  	/* reset timer */  	timerp->timer_ter = MCFTIMER_TER_CAP | MCFTIMER_TER_REF; -	timestamp ++; +	timestamp++;  } -void timer_init (void) { +void timer_init(void) +{  	volatile timer_t *timerp = (timer_t *) (CFG_MBAR + MCFTIMER_BASE4);  	volatile intctrl_t *intp = (intctrl_t *) (CFG_MBAR + MCFSIM_ICR1); @@ -106,27 +112,29 @@ void timer_init (void) {  	timerp->timer_tmr = MCFTIMER_TMR_DISABLE;  	/* initialize and enable timer 4 interrupt */ -	irq_install_handler (72, mcf_timer_interrupt, 0); +	irq_install_handler(72, mcf_timer_interrupt, 0);  	intp->int_icr1 |= 0x0000000d;  	timerp->timer_tcn = 0;  	timerp->timer_trr = 1000;	/* Interrupt every ms */  	/* set a period of 1us, set timer mode to restart and enable timer and interrupt */ -	timerp->timer_tmr = (((CFG_CLK / 1000000) - 1)	<< 8) | MCFTIMER_TMR_CLK1 | -		MCFTIMER_TMR_RESTART | MCFTIMER_TMR_ENORI | MCFTIMER_TMR_ENABLE; +	timerp->timer_tmr = +	    (((CFG_CLK / 1000000) - +	      1) << 8) | MCFTIMER_TMR_CLK1 | MCFTIMER_TMR_RESTART | +	    MCFTIMER_TMR_ENORI | MCFTIMER_TMR_ENABLE;  } -void reset_timer (void) +void reset_timer(void)  {  	timestamp = 0;  } -ulong get_timer (ulong base) +ulong get_timer(ulong base)  {  	return (timestamp - base);  } -void set_timer (ulong t) +void set_timer(ulong t)  {  	timestamp = t;  } @@ -139,7 +147,7 @@ void udelay(unsigned long usec)  	volatile unsigned short *timerp;  	uint tmp; -	timerp = (volatile unsigned short *) (CFG_MBAR + MCFTIMER_BASE3); +	timerp = (volatile unsigned short *)(CFG_MBAR + MCFTIMER_BASE3);  	while (usec > 0) {  		if (usec > 65000) @@ -154,21 +162,21 @@ void udelay(unsigned long usec)  		/* set period to 1 us */  		timerp[MCFTIMER_PCSR] =  #ifdef CONFIG_M5271 -			(6 << 8) | MCFTIMER_PCSR_EN | MCFTIMER_PCSR_OVW; -#else /* !CONFIG_M5271 */ -			(5 << 8) | MCFTIMER_PCSR_EN | MCFTIMER_PCSR_OVW; -#endif /* CONFIG_M5271 */ +		    (6 << 8) | MCFTIMER_PCSR_EN | MCFTIMER_PCSR_OVW; +#else				/* !CONFIG_M5271 */ +		    (5 << 8) | MCFTIMER_PCSR_EN | MCFTIMER_PCSR_OVW; +#endif				/* CONFIG_M5271 */  		timerp[MCFTIMER_PMR] = tmp; -		while (timerp[MCFTIMER_PCNTR] > 0); +		while (timerp[MCFTIMER_PCNTR] > 0) ;  	}  } -void timer_init (void) +void timer_init(void)  {  	volatile unsigned short *timerp; -	timerp = (volatile unsigned short *) (CFG_MBAR + MCFTIMER_BASE4); +	timerp = (volatile unsigned short *)(CFG_MBAR + MCFTIMER_BASE4);  	timestamp = 0;  	/* Set up TIMER 4 as poll clock */ @@ -176,27 +184,27 @@ void timer_init (void)  	timerp[MCFTIMER_PMR] = lastinc = 0;  	timerp[MCFTIMER_PCSR] =  #ifdef CONFIG_M5271 -		(6 << 8) | MCFTIMER_PCSR_EN | MCFTIMER_PCSR_OVW; -#else /* !CONFIG_M5271 */ -		(5 << 8) | MCFTIMER_PCSR_EN | MCFTIMER_PCSR_OVW; -#endif /* CONFIG_M5271 */ +	    (6 << 8) | MCFTIMER_PCSR_EN | MCFTIMER_PCSR_OVW; +#else				/* !CONFIG_M5271 */ +	    (5 << 8) | MCFTIMER_PCSR_EN | MCFTIMER_PCSR_OVW; +#endif				/* CONFIG_M5271 */  } -void set_timer (ulong t) +void set_timer(ulong t)  {  	volatile unsigned short *timerp; -	timerp = (volatile unsigned short *) (CFG_MBAR + MCFTIMER_BASE4); +	timerp = (volatile unsigned short *)(CFG_MBAR + MCFTIMER_BASE4);  	timestamp = 0;  	timerp[MCFTIMER_PMR] = lastinc = 0;  } -ulong get_timer (ulong base) +ulong get_timer(ulong base)  {  	unsigned short now, diff;  	volatile unsigned short *timerp; -	timerp = (volatile unsigned short *) (CFG_MBAR + MCFTIMER_BASE4); +	timerp = (volatile unsigned short *)(CFG_MBAR + MCFTIMER_BASE4);  	now = timerp[MCFTIMER_PCNTR];  	diff = -(now - lastinc); @@ -205,14 +213,13 @@ ulong get_timer (ulong base)  	return timestamp - base;  } -void wait_ticks (unsigned long ticks) +void wait_ticks(unsigned long ticks)  { -	set_timer (0); -	while (get_timer (0) < ticks); +	set_timer(0); +	while (get_timer(0) < ticks) ;  }  #endif -  #if defined(CONFIG_M5249)  /*   * We use timer 1 which is running with a period of 1 us @@ -234,8 +241,10 @@ void udelay(unsigned long usec)  		timerp->timer_tcn = 0;  		/* set period to 1 us */  		/* on m5249 the system clock is (cpu_clk / 2) -> divide by 2000000 */ -		timerp->timer_tmr = (((CFG_CLK / 2000000) - 1)	<< 8) | MCFTIMER_TMR_CLK1 | -				     MCFTIMER_TMR_FREERUN | MCFTIMER_TMR_ENABLE; +		timerp->timer_tmr = +		    (((CFG_CLK / 2000000) - +		      1) << 8) | MCFTIMER_TMR_CLK1 | MCFTIMER_TMR_FREERUN | +		    MCFTIMER_TMR_ENABLE;  		start = now = timerp->timer_tcn;  		while (now < start + tmp) @@ -243,7 +252,8 @@ void udelay(unsigned long usec)  	}  } -void mcf_timer_interrupt (void * not_used){ +void mcf_timer_interrupt(void *not_used) +{  	volatile timer_t *timerp = (timer_t *) (CFG_MBAR + MCFTIMER_BASE2);  	/* check for timer 2 interrupts */ @@ -253,10 +263,11 @@ void mcf_timer_interrupt (void * not_used){  	/* reset timer */  	timerp->timer_ter = MCFTIMER_TER_CAP | MCFTIMER_TER_REF; -	timestamp ++; +	timestamp++;  } -void timer_init (void) { +void timer_init(void) +{  	volatile timer_t *timerp = (timer_t *) (CFG_MBAR + MCFTIMER_BASE2);  	timestamp = 0; @@ -265,34 +276,196 @@ void timer_init (void) {  	timerp->timer_tmr = MCFTIMER_TMR_DISABLE;  	/* initialize and enable timer 2 interrupt */ -	irq_install_handler (31, mcf_timer_interrupt, 0); +	irq_install_handler(31, mcf_timer_interrupt, 0);  	mbar_writeLong(MCFSIM_IMR, mbar_readLong(MCFSIM_IMR) & ~0x00000400); -	mbar_writeByte(MCFSIM_TIMER2ICR, MCFSIM_ICR_AUTOVEC | MCFSIM_ICR_LEVEL7 | MCFSIM_ICR_PRI3); +	mbar_writeByte(MCFSIM_TIMER2ICR, +		       MCFSIM_ICR_AUTOVEC | MCFSIM_ICR_LEVEL7 | +		       MCFSIM_ICR_PRI3);  	timerp->timer_tcn = 0;  	timerp->timer_trr = 1000;	/* Interrupt every ms */  	/* set a period of 1us, set timer mode to restart and enable timer and interrupt */  	/* on m5249 the system clock is (cpu_clk / 2) -> divide by 2000000 */ -	timerp->timer_tmr = (((CFG_CLK / 2000000) - 1)	<< 8) | MCFTIMER_TMR_CLK1 | -		MCFTIMER_TMR_RESTART | MCFTIMER_TMR_ENORI | MCFTIMER_TMR_ENABLE; +	timerp->timer_tmr = +	    (((CFG_CLK / 2000000) - +	      1) << 8) | MCFTIMER_TMR_CLK1 | MCFTIMER_TMR_RESTART | +	    MCFTIMER_TMR_ENORI | MCFTIMER_TMR_ENABLE;  } -void reset_timer (void) +void reset_timer(void)  {  	timestamp = 0;  } -ulong get_timer (ulong base) +ulong get_timer(ulong base)  {  	return (timestamp - base);  } -void set_timer (ulong t) +void set_timer(ulong t)  {  	timestamp = t;  }  #endif +#if defined(CONFIG_MCFTMR) +#ifndef CFG_UDELAY_BASE +#	error	"uDelay base not defined!" +#endif + +#if !defined(CFG_TMR_BASE) || !defined(CFG_INTR_BASE) || !defined(CFG_TMRINTR_NO) || !defined(CFG_TMRINTR_MASK) +#	error	"TMR_BASE, INTR_BASE, TMRINTR_NO or TMRINTR_MASk not defined!" +#endif +extern void dtimer_intr_setup(void); + +void udelay(unsigned long usec) +{ +	volatile dtmr_t *timerp = (dtmr_t *) (CFG_UDELAY_BASE); +	uint start, now, tmp; + +	while (usec > 0) { +		if (usec > 65000) +			tmp = 65000; +		else +			tmp = usec; +		usec = usec - tmp; + +		/* Set up TIMER 3 as timebase clock */ +		timerp->tmr = DTIM_DTMR_RST_RST; +		timerp->tcn = 0; +		/* set period to 1 us */ +		timerp->tmr = +		    CFG_TIMER_PRESCALER | DTIM_DTMR_CLK_DIV1 | DTIM_DTMR_FRR | +		    DTIM_DTMR_RST_EN; + +		start = now = timerp->tcn; +		while (now < start + tmp) +			now = timerp->tcn; +	} +} + +void dtimer_interrupt(void *not_used) +{ +	volatile dtmr_t *timerp = (dtmr_t *) (CFG_TMR_BASE); +	volatile int0_t *intp = (int0_t *) (CFG_INTR_BASE); + +	/* check for timer interrupt asserted */ +	if ((intp->iprh0 & CFG_TMRINTR_MASK) == CFG_TMRINTR_MASK) { +		timerp->ter = (DTIM_DTER_CAP | DTIM_DTER_REF); +		timestamp++; +		return; +	} +} + +void timer_init(void) +{ +	volatile dtmr_t *timerp = (dtmr_t *) (CFG_TMR_BASE); + +	timestamp = 0; + +	timerp->tcn = 0; +	timerp->trr = 0; + +	/* Set up TIMER 4 as clock */ +	timerp->tmr = DTIM_DTMR_RST_RST; + +	/* initialize and enable timer interrupt */ +	irq_install_handler(CFG_TMRINTR_NO, dtimer_interrupt, 0); + +	timerp->tcn = 0; +	timerp->trr = 1000;	/* Interrupt every ms */ + +	dtimer_intr_setup(); + +	/* set a period of 1us, set timer mode to restart and enable timer and interrupt */ +	timerp->tmr = CFG_TIMER_PRESCALER | DTIM_DTMR_CLK_DIV1 | +	    DTIM_DTMR_FRR | DTIM_DTMR_ORRI | DTIM_DTMR_RST_EN; +} + +void reset_timer(void) +{ +	timestamp = 0; +} + +ulong get_timer(ulong base) +{ +	return (timestamp - base); +} + +void set_timer(ulong t) +{ +	timestamp = t; +} +#endif				/* CONFIG_MCFTMR */ + +#if defined(CONFIG_MCFPIT) +#if !defined(CFG_PIT_BASE) +#	error	"CFG_PIT_BASE not defined!" +#endif + +static unsigned short lastinc; + +void udelay(unsigned long usec) +{ +	volatile pit_t *timerp = (pit_t *) (CFG_UDELAY_BASE); +	uint tmp; + +	while (usec > 0) { +		if (usec > 65000) +			tmp = 65000; +		else +			tmp = usec; +		usec = usec - tmp; + +		/* Set up TIMER 3 as timebase clock */ +		timerp->pcsr = PIT_PCSR_OVW; +		timerp->pmr = 0; +		/* set period to 1 us */ +		timerp->pcsr |= PIT_PCSR_PRE(CFG_PIT_PRESCALE) | PIT_PCSR_EN; + +		timerp->pmr = tmp; +		while (timerp->pcntr > 0) ; +	} +} + +void timer_init(void) +{ +	volatile pit_t *timerp = (pit_t *) (CFG_PIT_BASE); +	timestamp = 0; + +	/* Set up TIMER 4 as poll clock */ +	timerp->pcsr = PIT_PCSR_OVW; +	timerp->pmr = lastinc = 0; +	timerp->pcsr |= PIT_PCSR_PRE(CFG_PIT_PRESCALE) | PIT_PCSR_EN; +} + +void set_timer(ulong t) +{ +	volatile pit_t *timerp = (pit_t *) (CFG_PIT_BASE); + +	timestamp = 0; +	timerp->pmr = lastinc = 0; +} + +ulong get_timer(ulong base) +{ +	unsigned short now, diff; +	volatile pit_t *timerp = (pit_t *) (CFG_PIT_BASE); + +	now = timerp->pcntr; +	diff = -(now - lastinc); + +	timestamp += diff; +	lastinc = now; +	return timestamp - base; +} + +void wait_ticks(unsigned long ticks) +{ +	set_timer(0); +	while (get_timer(0) < ticks) ; +} +#endif				/* CONFIG_MCFPIT */  /*   * This function is derived from PowerPC code (read timebase as long long). @@ -307,7 +480,7 @@ unsigned long long get_ticks(void)   * This function is derived from PowerPC code (timebase clock frequency).   * On M68K it returns the number of timer ticks per second.   */ -ulong get_tbclk (void) +ulong get_tbclk(void)  {  	ulong tbclk;  	tbclk = CFG_HZ; |