diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2022-03-14 10:18:17 +0100 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2022-03-14 10:18:17 +0100 |
commit | b166e52541f2357ce126a92ce1d9a580fdca719d (patch) | |
tree | 11e440b630b14bdd32dc669940a95b5c564e495f /drivers/clocksource/timer-imx-sysctr.c | |
parent | 1f1893d78180c0c8bd4f53405420aa31eabfb263 (diff) | |
parent | 4467b8bad2401794fb89a0268c8c8257180bf60f (diff) | |
download | linux-b166e52541f2357ce126a92ce1d9a580fdca719d.tar.gz linux-b166e52541f2357ce126a92ce1d9a580fdca719d.tar.bz2 linux-b166e52541f2357ce126a92ce1d9a580fdca719d.zip |
Merge tag 'timers-v5.18-rc1' of https://git.linaro.org/people/daniel.lezcano/linux into timers/core
Pull clocksource/events updates from Daniel Lezcano:
- Fix return error code check for the timer-of layer when getting
the base address (Guillaume Ranquet)
- Remove MMIO dependency, add notrace annotation for sched_clock
and increase the timer resolution for the Microchip
PIT64b (Claudiu Beznea)
- Convert DT bindings to yaml for the Tegra timer (David Heidelberg)
- Fix compilation error on architecture other than ARM for the
i.MX TPM (Nathan Chancellor)
- Add support for the event stream scaling for 1GHz counter on
the arch ARM timer (Marc Zyngier)
- Support a higher number of interrupts by the Exynos MCT timer
driver (Alim Akhtar)
- Detect and prevent memory corruption when the specified number
of interrupts in the DTS is greater than the array size in the
code for the Exynos MCT timer (Krzysztof Kozlowski)
- Fix regression from a previous errata fix on the TI DM
timer (Drew Fustini)
- Several fixes and code improvements for the i.MX TPM
driver (Peng Fan)
Link: https://lore.kernel.org/all/a8cd9be9-7d70-80df-2b74-1a8226a215e1@linaro.org
Diffstat (limited to 'drivers/clocksource/timer-imx-sysctr.c')
-rw-r--r-- | drivers/clocksource/timer-imx-sysctr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clocksource/timer-imx-sysctr.c b/drivers/clocksource/timer-imx-sysctr.c index 55a8e198d2a1..523e37662a6e 100644 --- a/drivers/clocksource/timer-imx-sysctr.c +++ b/drivers/clocksource/timer-imx-sysctr.c @@ -110,7 +110,7 @@ static struct timer_of to_sysctr = { }, .of_irq = { .handler = sysctr_timer_interrupt, - .flags = IRQF_TIMER | IRQF_IRQPOLL, + .flags = IRQF_TIMER, }, .of_clk = { .name = "per", |