diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2021-06-18 17:57:47 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2021-06-18 17:57:47 +0200 |
| commit | f6b6a80360995ad175e43d220af979f119e52cd3 (patch) | |
| tree | 9405c8fc1df1e38c424d875dd875f0109b3ea609 /drivers/clocksource/arm_arch_timer.c | |
| parent | 245a057fee18be08d6ac12357463579d06bea077 (diff) | |
| parent | 3d41fff3ae3980c055f3c7861264c46c924f3e4c (diff) | |
Merge tag 'timers-v5.14' of https://git.linaro.org/people/daniel.lezcano/linux into timers/core
Pull clockevent/source updates from Daniel Lezcano:
- Remove arch_timer_rate1 variable as it is unused in the architected
ARM timer (Jisheng Zhang)
- Minor cleanups (whitespace, constification, ...) for the Samsung pwm
timer (Krzysztof Kozlowski)
- Acknowledge and disable the timer interrupt at suspend time to
prevent the suspend to be aborted by the ATF if there is a pending
one on the Mediatek timer (Evan Benn)
- Save and restore the configuration register at suspend/resume time
for TI dm timer (Tony Lindgren)
- Set the scene for the next timers support by renaming the array
variables on the Ingenic time (Zhou Yanjie)
- Add the clock rate change notification to adjust the prescalar value
and compensate the clock source on the ARM global timer (Andrea
Merello)
- Add missing variable static annotation on the ARM global timer (Zou
Wei)
- Remove a duplicate argument when building the bits field on the ARM
global timer (Wan Jiabing)
- Improve the timer workaround function by reducing the loop on the
Allwinner A64 timer (Samuel Holland)
- Do no restore the register context in case of error on the TI dm
timer (Tony Lindgren)
Link: https://lore.kernel.org/r/65ed5f60-d7a5-b4ae-ff78-0382d4671cc5@linaro.org
Diffstat (limited to 'drivers/clocksource/arm_arch_timer.c')
| -rw-r--r-- | drivers/clocksource/arm_arch_timer.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c index fe1a82627d57..be6d741d404c 100644 --- a/drivers/clocksource/arm_arch_timer.c +++ b/drivers/clocksource/arm_arch_timer.c @@ -64,7 +64,6 @@ struct arch_timer { #define to_arch_timer(e) container_of(e, struct arch_timer, evt) static u32 arch_timer_rate __ro_after_init; -u32 arch_timer_rate1 __ro_after_init; static int arch_timer_ppi[ARCH_TIMER_MAX_TIMER_PPI] __ro_after_init; static const char *arch_timer_ppi_names[ARCH_TIMER_MAX_TIMER_PPI] = { @@ -365,7 +364,7 @@ static u64 notrace arm64_858921_read_cntvct_el0(void) do { \ _val = read_sysreg(reg); \ _retries--; \ - } while (((_val + 1) & GENMASK(9, 0)) <= 1 && _retries); \ + } while (((_val + 1) & GENMASK(8, 0)) <= 1 && _retries); \ \ WARN_ON_ONCE(!_retries); \ _val; \ |