diff options
| author | Wolfgang Denk <wd@denx.de> | 2012-03-17 21:44:35 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2012-03-17 21:44:35 +0100 |
| commit | df25d49959da75cfaa1e4708669ef550d0000ce6 (patch) | |
| tree | 706b3376b46905b64e745ef82cc4b9e0bd808636 /arch | |
| parent | 993d30de990c614547b457984a46e49425e9625d (diff) | |
| parent | 78df8c68cd42c9db3601b331018b82e9627d08ce (diff) | |
| download | blackbird-obmc-uboot-df25d49959da75cfaa1e4708669ef550d0000ce6.tar.gz blackbird-obmc-uboot-df25d49959da75cfaa1e4708669ef550d0000ce6.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-sh
* 'master' of git://git.denx.de/u-boot-sh:
sh: timer: Remove unnecessary variable 'ticks'
sh: Fix sh7264 clock speed and related serial setting
net: sh_eth: Remove unnecessary return
net: sh_eth: Collect up EDMR_INIT_CNT to TIMEOUT_CNT
net: sh_eth: Remove SH_ETH_PHY_DELAY
sh: ecovec: Add support PHY of SMSC
sh: sh_eth: Add support SH7724
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/sh/lib/time.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/sh/lib/time.c b/arch/sh/lib/time.c index c70baedbf1..a01596cace 100644 --- a/arch/sh/lib/time.c +++ b/arch/sh/lib/time.c @@ -108,14 +108,9 @@ int timer_init (void) unsigned long long get_ticks (void) { unsigned long tcnt = 0 - readl(TCNT0); - unsigned long ticks; - if (last_tcnt > tcnt) { /* overflow */ + if (last_tcnt > tcnt) /* overflow */ overflow_ticks++; - ticks = (0xffffffff - last_tcnt) + tcnt; - } else { - ticks = tcnt; - } last_tcnt = tcnt; return (overflow_ticks << 32) | tcnt; |
