The following commit has been merged into the timers/core branch of tip: Commit-ID: 2f71078e7753b2fbba62999aa46c2fad16df9d98 Gitweb: https://git.kernel.org/tip/2f71078e7753b2fbba62999aa46c2fad16df9d98 Author: Zhen Lei <thunder.leiz...@huawei.com> AuthorDate: Fri, 18 Sep 2020 21:22:32 +08:00 Committer: Daniel Lezcano <daniel.lezc...@linaro.org> CommitterDate: Thu, 24 Sep 2020 10:51:04 +02:00
clocksource/drivers/sp804: Remove a mismatched comment writel(0, base + TIMER_CTRL); ... ... writel(xxx | TIMER_CTRL_PERIODIC, base + TIMER_CTRL); The timer is just temporarily disabled, and it will be set to periodic mode later. The description of the field TimerMode of the register TimerXControl as shown below: 0 = Timer module is in free-running mode (default) 1 = Timer module is in periodic mode. Signed-off-by: Zhen Lei <thunder.leiz...@huawei.com> Signed-off-by: Daniel Lezcano <daniel.lezc...@linaro.org> Link: https://lore.kernel.org/r/20200918132237.3552-5-thunder.leiz...@huawei.com --- drivers/clocksource/timer-sp804.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/clocksource/timer-sp804.c b/drivers/clocksource/timer-sp804.c index 097f5a8..a443f39 100644 --- a/drivers/clocksource/timer-sp804.c +++ b/drivers/clocksource/timer-sp804.c @@ -76,7 +76,6 @@ int __init sp804_clocksource_and_sched_clock_init(void __iomem *base, if (rate < 0) return -EINVAL; - /* setup timer 0 as free-running clocksource */ writel(0, base + TIMER_CTRL); writel(0xffffffff, base + TIMER_LOAD); writel(0xffffffff, base + TIMER_VALUE);
