@ -23,6 +23,7 @@
# include <common.h>
# include <common.h>
# include <asm/arch/imx-regs.h>
# include <asm/arch/imx-regs.h>
# include <asm/arch/clock.h>
# include <div64.h>
# include <div64.h>
# include <watchdog.h>
# include <watchdog.h>
# include <asm/io.h>
# include <asm/io.h>
@ -53,28 +54,27 @@ DECLARE_GLOBAL_DATA_PTR;
static inline unsigned long long tick_to_time ( unsigned long long tick )
static inline unsigned long long tick_to_time ( unsigned long long tick )
{
{
tick * = CONFIG_SYS_HZ ;
tick * = CONFIG_SYS_HZ ;
do_div ( tick , CONFIG_MX31 _CLK32) ;
do_div ( tick , MXC _CLK32) ;
return tick ;
return tick ;
}
}
static inline unsigned long long time_to_tick ( unsigned long long time )
static inline unsigned long long time_to_tick ( unsigned long long time )
{
{
time * = CONFIG_MX31 _CLK32;
time * = MXC _CLK32;
do_div ( time , CONFIG_SYS_HZ ) ;
do_div ( time , CONFIG_SYS_HZ ) ;
return time ;
return time ;
}
}
static inline unsigned long long us_to_tick ( unsigned long long us )
static inline unsigned long long us_to_tick ( unsigned long long us )
{
{
us = us * CONFIG_MX31 _CLK32 + 999999 ;
us = us * MXC _CLK32 + 999999 ;
do_div ( us , 1000000 ) ;
do_div ( us , 1000000 ) ;
return us ;
return us ;
}
}
# else
# else
/* ~2% error */
/* ~2% error */
# define TICK_PER_TIME ((CONFIG_MX31_CLK32 + CONFIG_SYS_HZ / 2) \
# define TICK_PER_TIME ((MXC_CLK32 + CONFIG_SYS_HZ / 2) / CONFIG_SYS_HZ)
/ CONFIG_SYS_HZ )
# define US_PER_TICK (1000000 / MXC_CLK32)
# define US_PER_TICK (1000000 / CONFIG_MX31_CLK32)
static inline unsigned long long tick_to_time ( unsigned long long tick )
static inline unsigned long long tick_to_time ( unsigned long long tick )
{
{
@ -128,7 +128,7 @@ ulong get_timer_masked(void)
{
{
/*
/*
* get_ticks ( ) returns a long long ( 64 bit ) , it wraps in
* get_ticks ( ) returns a long long ( 64 bit ) , it wraps in
* 2 ^ 64 / CONFIG_MX31 _CLK32 = 2 ^ 64 / 2 ^ 15 = 2 ^ 49 ~ 5 * 10 ^ 14 ( s ) ~
* 2 ^ 64 / MXC _CLK32 = 2 ^ 64 / 2 ^ 15 = 2 ^ 49 ~ 5 * 10 ^ 14 ( s ) ~
* 5 * 10 ^ 9 days . . . and get_ticks ( ) * CONFIG_SYS_HZ wraps in
* 5 * 10 ^ 9 days . . . and get_ticks ( ) * CONFIG_SYS_HZ wraps in
* 5 * 10 ^ 6 days - long enough .
* 5 * 10 ^ 6 days - long enough .
*/
*/
@ -159,7 +159,7 @@ void __udelay(unsigned long usec)
*/
*/
ulong get_tbclk ( void )
ulong get_tbclk ( void )
{
{
return CONFIG_MX31 _CLK32;
return MXC _CLK32;
}
}
void reset_cpu ( ulong addr )
void reset_cpu ( ulong addr )