diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2021-04-09 13:25:16 +0300 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2021-04-09 13:25:16 +0300 |
| commit | 7b3efb50f7831102cb44d8a0e55d21f2cbac85fa (patch) | |
| tree | 9bc584140e37521f22a3c54b9d6c21eff7e44324 /include | |
| parent | d4c7c28806616809e3baa0b7cd8c665516b2726d (diff) | |
| parent | 8120891105ba32b45bc35f7dc07e6d87a8314556 (diff) | |
| download | linux-7b3efb50f7831102cb44d8a0e55d21f2cbac85fa.tar.xz | |
Merge tag 'timers-v5.13-rc1' of https://git.linaro.org/people/daniel.lezcano/linux into timers/core
Pull clocksource/event updates from Daniel Lezcano:
- Add dt bindings for the wpcm450 and the timer declaration (Jonathan
Neuschäfer)
- Add dt bindings for the JZ4760, the timer declaration for the
ingenic ost and timer (Paul Cercueil)
- Add dt bindings for the cmt r8a779a0 (Wolfram Sang)
- Add dt bindings for the cmt r8a77961 (Niklas Söderlund)
- Add missing dt bindings for the tmu r8a7795, r8a7796, r8a77961, r8a77965,
r8a77990 and r8a77995 (Niklas Söderlund)
- Check pending post before writing a new post in register for the
timer TI dm and add the stopped callback ops to prevent any
spurious interrupt (Tony Lindgren)
- Fix return value check at init when calling device_node_to_regmap()
for the Ingenic OST timer (Wei Yongjun)
- Fix a trivial typo s/overflw/overflow/ for the pistachio timer (Drew Fustini)
- Don't use CMTOUT_IE with R-Car Gen2/3 (Wolfram Sang)
- Fix rollback when the initialization fails on the dw_apb timer (Dinh Nguyen)
- Switch to timer TI dm on dra7 in order to prevent using the bogus
architected timer which fails to wrap correctly after 388 days (Tony Lindgren)
- Add function annotation to optimize memory for the ARM architected
timer (Jisheng Zhang)
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/cpuhotplug.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/cpuhotplug.h b/include/linux/cpuhotplug.h index f14adb882338..cc7c3fda2aa6 100644 --- a/include/linux/cpuhotplug.h +++ b/include/linux/cpuhotplug.h @@ -135,6 +135,7 @@ enum cpuhp_state { CPUHP_AP_RISCV_TIMER_STARTING, CPUHP_AP_CLINT_TIMER_STARTING, CPUHP_AP_CSKY_TIMER_STARTING, + CPUHP_AP_TI_GP_TIMER_STARTING, CPUHP_AP_HYPERV_TIMER_STARTING, CPUHP_AP_KVM_STARTING, CPUHP_AP_KVM_ARM_VGIC_INIT_STARTING, |