summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Zyngier <marc.zyngier@arm.com>2019-04-08 16:49:02 +0100
committerWill Deacon <will.deacon@arm.com>2019-04-30 16:09:27 +0100
commiteae1ddc615bef9e1a1958a4b867a0a1678049bb3 (patch)
tree1b56fb017cbe01f7b6775bb29d1603177b6ffb89
parent1f5b62f09f6b314c8d70b9de5182dae4de1f94da (diff)
downloadlinux-stable-eae1ddc615bef9e1a1958a4b867a0a1678049bb3.tar.gz
linux-stable-eae1ddc615bef9e1a1958a4b867a0a1678049bb3.tar.bz2
linux-stable-eae1ddc615bef9e1a1958a4b867a0a1678049bb3.zip
watchdog/sbsa: Use arch_timer_read_counter instead of arch_counter_get_cntvct
Only arch_timer_read_counter will guarantee that workarounds are applied. So let's use this one instead of arch_counter_get_cntvct. Acked-by: Mark Rutland <mark.rutland@arm.com> Reviewed-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> Signed-off-by: Will Deacon <will.deacon@arm.com>
-rw-r--r--drivers/watchdog/sbsa_gwdt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/sbsa_gwdt.c b/drivers/watchdog/sbsa_gwdt.c
index e8bd9887c566..e221e47396ab 100644
--- a/drivers/watchdog/sbsa_gwdt.c
+++ b/drivers/watchdog/sbsa_gwdt.c
@@ -161,7 +161,7 @@ static unsigned int sbsa_gwdt_get_timeleft(struct watchdog_device *wdd)
timeleft += readl(gwdt->control_base + SBSA_GWDT_WOR);
timeleft += lo_hi_readq(gwdt->control_base + SBSA_GWDT_WCV) -
- arch_counter_get_cntvct();
+ arch_timer_read_counter();
do_div(timeleft, gwdt->clk);