diff options
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/cpu/arm1136/mx31/timer.c | 2 | ||||
| -rw-r--r-- | arch/arm/cpu/arm1136/omap24xx/timer.c | 22 | ||||
| -rw-r--r-- | arch/arm/cpu/arm920t/a320/timer.c | 2 | ||||
| -rw-r--r-- | arch/arm/cpu/arm926ejs/omap/timer.c | 4 | ||||
| -rw-r--r-- | arch/arm/cpu/arm926ejs/versatile/timer.c | 4 | ||||
| -rw-r--r-- | arch/arm/cpu/arm_cortexa8/mx51/timer.c | 2 | 
6 files changed, 18 insertions, 18 deletions
| diff --git a/arch/arm/cpu/arm1136/mx31/timer.c b/arch/arm/cpu/arm1136/mx31/timer.c index 7972ba0dd..b8848c48b 100644 --- a/arch/arm/cpu/arm1136/mx31/timer.c +++ b/arch/arm/cpu/arm1136/mx31/timer.c @@ -151,7 +151,7 @@ void set_timer (ulong t)  	timestamp = time_to_tick(t);  } -/* delay x useconds AND perserve advance timstamp value */ +/* delay x useconds AND preserve advance timestamp value */  void __udelay (unsigned long usec)  {  	unsigned long long tmp; diff --git a/arch/arm/cpu/arm1136/omap24xx/timer.c b/arch/arm/cpu/arm1136/omap24xx/timer.c index 67547490f..68fe1b220 100644 --- a/arch/arm/cpu/arm1136/omap24xx/timer.c +++ b/arch/arm/cpu/arm1136/omap24xx/timer.c @@ -73,25 +73,25 @@ void set_timer (ulong t)  	timestamp = t;  } -/* delay x useconds AND perserve advance timstamp value */ +/* delay x useconds AND preserve advance timestamp value */  void __udelay (unsigned long usec)  {  	ulong tmo, tmp; -	if (usec >= 1000) {			/* if "big" number, spread normalization to seconds */ -		tmo = usec / 1000;		/* start to normalize for usec to ticks per sec */ -		tmo *= CONFIG_SYS_HZ;			/* find number of "ticks" to wait to achieve target */ -		tmo /= 1000;			/* finish normalize. */ -	} else {					/* else small number, don't kill it prior to HZ multiply */ +	if (usec >= 1000) {		/* if "big" number, spread normalization to seconds */ +		tmo = usec / 1000;	/* start to normalize for usec to ticks per sec */ +		tmo *= CONFIG_SYS_HZ;	/* find number of "ticks" to wait to achieve target */ +		tmo /= 1000;		/* finish normalize. */ +	} else {			/* else small number, don't kill it prior to HZ multiply */  		tmo = usec * CONFIG_SYS_HZ;  		tmo /= (1000*1000);  	}  	tmp = get_timer (0);		/* get current timestamp */ -	if ( (tmo + tmp + 1) < tmp )/* if setting this forward will roll time stamp */ +	if ( (tmo + tmp + 1) < tmp )	/* if setting this forward will roll time stamp */  		reset_timer_masked ();	/* reset "advancing" timestamp to 0, set lastinc value */  	else -		tmo	+= tmp;				/* else, set advancing stamp wake up time */ +		tmo	+= tmp;		/* else, set advancing stamp wake up time */  	while (get_timer_masked () < tmo)/* loop till event */  		/*NOP*/;  } @@ -100,16 +100,16 @@ void reset_timer_masked (void)  {  	/* reset time */  	lastinc = READ_TIMER;		/* capture current incrementer value time */ -	timestamp = 0;				/* start "advancing" time stamp from 0 */ +	timestamp = 0;			/* start "advancing" time stamp from 0 */  }  ulong get_timer_masked (void)  {  	ulong now = READ_TIMER;		/* current tick value */ -	if (now >= lastinc)			/* normal mode (non roll) */ +	if (now >= lastinc)		/* normal mode (non roll) */  		timestamp += (now - lastinc); /* move stamp fordward with absoulte diff ticks */ -	else						/* we have rollover of incrementer */ +	else				/* we have rollover of incrementer */  		timestamp += (0xFFFFFFFF - lastinc) + now;  	lastinc = now;  	return timestamp; diff --git a/arch/arm/cpu/arm920t/a320/timer.c b/arch/arm/cpu/arm920t/a320/timer.c index bb655930d..d69dbff0e 100644 --- a/arch/arm/cpu/arm920t/a320/timer.c +++ b/arch/arm/cpu/arm920t/a320/timer.c @@ -155,7 +155,7 @@ void set_timer(ulong t)  	timestamp = t;  } -/* delay x useconds AND perserve advance timstamp value */ +/* delay x useconds AND preserve advance timestamp value */  void udelay(unsigned long usec)  {  	long tmo = usec * (TIMER_CLOCK / 1000) / 1000; diff --git a/arch/arm/cpu/arm926ejs/omap/timer.c b/arch/arm/cpu/arm926ejs/omap/timer.c index 2ac38c40b..7d4b6e602 100644 --- a/arch/arm/cpu/arm926ejs/omap/timer.c +++ b/arch/arm/cpu/arm926ejs/omap/timer.c @@ -79,14 +79,14 @@ void set_timer (ulong t)  	timestamp = t;  } -/* delay x useconds AND perserve advance timstamp value */ +/* delay x useconds AND preserve advance timestamp value */  void __udelay (unsigned long usec)  {  	ulong tmo, tmp;  	if(usec >= 1000){		/* if "big" number, spread normalization to seconds */  		tmo = usec / 1000;	/* start to normalize for usec to ticks per sec */ -		tmo *= CONFIG_SYS_HZ;		/* find number of "ticks" to wait to achieve target */ +		tmo *= CONFIG_SYS_HZ;	/* find number of "ticks" to wait to achieve target */  		tmo /= 1000;		/* finish normalize. */  	}else{				/* else small number, don't kill it prior to HZ multiply */  		tmo = usec * CONFIG_SYS_HZ; diff --git a/arch/arm/cpu/arm926ejs/versatile/timer.c b/arch/arm/cpu/arm926ejs/versatile/timer.c index 563db3654..81d67490d 100644 --- a/arch/arm/cpu/arm926ejs/versatile/timer.c +++ b/arch/arm/cpu/arm926ejs/versatile/timer.c @@ -108,14 +108,14 @@ void set_timer (ulong t)  	timestamp = t;  } -/* delay x useconds AND perserve advance timstamp value */ +/* delay x useconds AND preserve advance timestamp value */  void __udelay (unsigned long usec)  {  	ulong tmo, tmp;  	if(usec >= 1000){		/* if "big" number, spread normalization to seconds */  		tmo = usec / 1000;	/* start to normalize for usec to ticks per sec */ -		tmo *= CONFIG_SYS_HZ;		/* find number of "ticks" to wait to achieve target */ +		tmo *= CONFIG_SYS_HZ;	/* find number of "ticks" to wait to achieve target */  		tmo /= 1000;		/* finish normalize. */  	}else{				/* else small number, don't kill it prior to HZ multiply */  		tmo = usec * CONFIG_SYS_HZ; diff --git a/arch/arm/cpu/arm_cortexa8/mx51/timer.c b/arch/arm/cpu/arm_cortexa8/mx51/timer.c index 8ecfec66d..81c4a0614 100644 --- a/arch/arm/cpu/arm_cortexa8/mx51/timer.c +++ b/arch/arm/cpu/arm_cortexa8/mx51/timer.c @@ -102,7 +102,7 @@ void set_timer(ulong t)  	timestamp = t;  } -/* delay x useconds AND perserve advance timstamp value */ +/* delay x useconds AND preserve advance timestamp value */  void __udelay(unsigned long usec)  {  	unsigned long now, start, tmo; |