diff options
| author | Tom Rini <trini@ti.com> | 2013-07-25 08:22:08 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-07-25 08:51:51 -0400 |
| commit | aaf5e825606a70ddc8fca8e366d8c16a6fd3cc7c (patch) | |
| tree | 64eaea4d396dce4e0a30bb955b8240d4b199cdca /arch/nds32/cpu/n1213/ag102/timer.c | |
| parent | 0b17998e509e5614633aee0a3c5d6248f8bc580b (diff) | |
| parent | c54fd3efa497876a33cc3c6e7df514ae53abc729 (diff) | |
| download | olio-uboot-2014.01-aaf5e825606a70ddc8fca8e366d8c16a6fd3cc7c.tar.xz olio-uboot-2014.01-aaf5e825606a70ddc8fca8e366d8c16a6fd3cc7c.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-nds32
Diffstat (limited to 'arch/nds32/cpu/n1213/ag102/timer.c')
| -rw-r--r-- | arch/nds32/cpu/n1213/ag102/timer.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/nds32/cpu/n1213/ag102/timer.c b/arch/nds32/cpu/n1213/ag102/timer.c index ec6eb52f2..758b35411 100644 --- a/arch/nds32/cpu/n1213/ag102/timer.c +++ b/arch/nds32/cpu/n1213/ag102/timer.c @@ -71,7 +71,8 @@ void reset_timer_masked(void) #ifdef CONFIG_FTTMR010_EXT_CLK lastdec = readl(&tmr->timer3_counter) / (TIMER_CLOCK / CONFIG_SYS_HZ); #else - lastdec = readl(&tmr->timer3_counter) / (CONFIG_SYS_CLK_FREQ / 2); + lastdec = readl(&tmr->timer3_counter) / + (CONFIG_SYS_CLK_FREQ / 2 / CONFIG_SYS_HZ); #endif timestamp = 0; /* start "advancing" time stamp from 0 */ @@ -95,8 +96,8 @@ ulong get_timer_masked(void) #ifdef CONFIG_FTTMR010_EXT_CLK ulong now = readl(&tmr->timer3_counter) / (TIMER_CLOCK / CONFIG_SYS_HZ); #else - ulong now = readl(&tmr->timer3_counter) / \ - (CONFIG_SYS_CLK_FREQ / 2 / 1024); + ulong now = readl(&tmr->timer3_counter) / + (CONFIG_SYS_CLK_FREQ / 2 / CONFIG_SYS_HZ); #endif debug("%s(): now = %lx, lastdec = %lx\n", __func__, now, lastdec); |