diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-04-04 11:49:32 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-04-04 11:49:32 +0200 |
| commit | be08abc2429c2e9cbce3d0abc1d315171d683520 (patch) | |
| tree | 9c3f8c892cf8918c9a5b4cd0b9b29558b0aff0e7 /arch/arm/imx-common/timer.c | |
| parent | 5eaa215607c8668bfa6a7183407eba8fec63d648 (diff) | |
| parent | d36b39bf0d1dbe4ef03f7fc1f20b2e52eb90acf5 (diff) | |
| download | u-boot-imx-be08abc2429c2e9cbce3d0abc1d315171d683520.zip u-boot-imx-be08abc2429c2e9cbce3d0abc1d315171d683520.tar.gz u-boot-imx-be08abc2429c2e9cbce3d0abc1d315171d683520.tar.bz2 | |
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Diffstat (limited to 'arch/arm/imx-common/timer.c')
| -rw-r--r-- | arch/arm/imx-common/timer.c | 26 |
1 files changed, 7 insertions, 19 deletions
diff --git a/arch/arm/imx-common/timer.c b/arch/arm/imx-common/timer.c index ab37d64..1dbc413 100644 --- a/arch/arm/imx-common/timer.c +++ b/arch/arm/imx-common/timer.c @@ -48,9 +48,6 @@ static struct mxc_gpt *cur_gpt = (struct mxc_gpt *)GPT1_BASE_ADDR; DECLARE_GLOBAL_DATA_PTR; -#define timestamp (gd->arch.tbl) -#define lastinc (gd->arch.lastinc) - static inline unsigned long long tick_to_time(unsigned long long tick) { tick *= CONFIG_SYS_HZ; @@ -70,7 +67,6 @@ static inline unsigned long long us_to_tick(unsigned long long usec) int timer_init(void) { int i; - ulong val; /* setup GP Timer 1 */ __raw_writel(GPTCR_SWR, &cur_gpt->control); @@ -85,9 +81,8 @@ int timer_init(void) i = __raw_readl(&cur_gpt->control); __raw_writel(i | GPTCR_CLKSOURCE_32 | GPTCR_TEN, &cur_gpt->control); - val = __raw_readl(&cur_gpt->counter); - lastinc = val / (MXC_CLK32 / CONFIG_SYS_HZ); - timestamp = 0; + gd->arch.tbl = __raw_readl(&cur_gpt->counter); + gd->arch.tbu = 0; return 0; } @@ -96,18 +91,11 @@ unsigned long long get_ticks(void) { ulong now = __raw_readl(&cur_gpt->counter); /* current tick value */ - if (now >= lastinc) { - /* - * normal mode (non roll) - * move stamp forward with absolut diff ticks - */ - timestamp += (now - lastinc); - } else { - /* we have rollover of incrementer */ - timestamp += (0xFFFFFFFF - lastinc) + now; - } - lastinc = now; - return timestamp; + /* increment tbu if tbl has rolled over */ + if (now < gd->arch.tbl) + gd->arch.tbu++; + gd->arch.tbl = now; + return (((unsigned long long)gd->arch.tbu) << 32) | gd->arch.tbl; } ulong get_timer_masked(void) |