summaryrefslogtreecommitdiff
path: root/drivers/timer/altera_timer.c
diff options
context:
space:
mode:
authorBin Meng <bmeng.cn@gmail.com>2015-11-24 13:31:17 -0700
committerSimon Glass <sjg@chromium.org>2015-12-01 06:23:51 -0700
commit9ca07ebbac3c94974db75e25004203289d9013bc (patch)
tree71505c28b02624db37f3edacd631af87ea08feef /drivers/timer/altera_timer.c
parentf838f124522ea4fb5202c1b584b4706aa48ee144 (diff)
downloadu-boot-imx-9ca07ebbac3c94974db75e25004203289d9013bc.zip
u-boot-imx-9ca07ebbac3c94974db75e25004203289d9013bc.tar.gz
u-boot-imx-9ca07ebbac3c94974db75e25004203289d9013bc.tar.bz2
dm: timer: Support 64-bit counter
There are timers with a 64-bit counter value but current timer uclass driver assumes a 32-bit one. Modify timer_get_count() to ask timer driver to always return a 64-bit counter value, and provide an inline helper function timer_conv_64() to handle the 32-bit/64-bit conversion automatically. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Acked-by: Simon Glass <sjg@chromium.org> Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'drivers/timer/altera_timer.c')
-rw-r--r--drivers/timer/altera_timer.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/timer/altera_timer.c b/drivers/timer/altera_timer.c
index 2364f1b..89fe05b 100644
--- a/drivers/timer/altera_timer.c
+++ b/drivers/timer/altera_timer.c
@@ -34,7 +34,7 @@ struct altera_timer_platdata {
struct altera_timer_regs *regs;
};
-static int altera_timer_get_count(struct udevice *dev, unsigned long *count)
+static int altera_timer_get_count(struct udevice *dev, u64 *count)
{
struct altera_timer_platdata *plat = dev->platdata;
struct altera_timer_regs *const regs = plat->regs;
@@ -46,7 +46,7 @@ static int altera_timer_get_count(struct udevice *dev, unsigned long *count)
/* Read timer value */
val = readl(&regs->snapl) & 0xffff;
val |= (readl(&regs->snaph) & 0xffff) << 16;
- *count = ~val;
+ *count = timer_conv_64(~val);
return 0;
}