Hi Thomas, this pull request contains new material for the 4.12. Please note there is a shared branch with ARM64, arch-timer-errata, which provides the necessary changes for the errata handling: https://lkml.org/lkml/2017/4/7/369
- Provide a framework to handle errata gracefuly for arm_arch_timer (Mark Zyngier) - Clarify the DT properties for the rockchip timer and add the clocksource as an alternative to the bogus architected timer (Alexander Kochetkov) - Rename the Gemini timer to Faraday timer fttmr010 and provide a specific initialization for Gemini (Linus Walleij) - Add missing newlines in the error message in the timers (Rafał Miłecki) - Read the clock once and implement the delay timer on Orion (Russell King) Thanks. -- Daniel The following changes since commit 5fc63f9577322d11019b6d357f73f5ce9031f263: timekeeping: Remove pointless conversion to bool (2017-03-31 10:26:56 +0200) are available in the git repository at: https://git.linaro.org/people/daniel.lezcano/linux.git clockevents/4.12 for you to fetch changes up to 6f9c89000c3f771c47adacaca2df775a25f27205: Merge tag 'arch-timer-errata' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into clockevents/4.12 (2017-04-07 16:23:29 +0200) ---------------------------------------------------------------- Alexander Kochetkov (5): dt-bindings: Clarify compatible property for rockchip timers ARM: dts: rockchip: Update compatible property for rk322x timer clocksource/drivers/rockchip_timer: Implement clocksource timer ARM: dts: rockchip: Add timer entries to rk3188 SoC ARM: dts: rockchip: disable arm-global-timer for rk3188 Daniel Lezcano (1): Merge tag 'arch-timer-errata' of git://git.kernel.org/.../maz/arm-platforms into clockevents/4.12 Linus Walleij (3): clocksource: Augment bindings for Faraday timer clocksource/drivers/gemini: Rename Gemini timer to Faraday clocksource/drivers/fttmr010: Refactor to handle clock Marc Zyngier (18): arm64: Allow checking of a CPU-local erratum arm64: Add CNTVCT_EL0 trap handler arm64: Define Cortex-A73 MIDR arm64: cpu_errata: Allow an erratum to be match for all revisions of a core arm64: cpu_errata: Add capability to advertise Cortex-A73 erratum 858921 arm64: arch_timer: Add infrastructure for multiple erratum detection methods arm64: arch_timer: Add erratum handler for CPU-specific capability arm64: arch_timer: Move arch_timer_reg_read/write around arm64: arch_timer: Get rid of erratum_workaround_set_sne arm64: arch_timer: Rework the set_next_event workarounds arm64: arch_timer: Make workaround methods optional arm64: arch_timer: Allows a CPU-specific erratum to only affect a subset of CPUs arm64: arch_timer: Move clocksource_counter and co around arm64: arch_timer: Save cntkctl_el1 as a per-cpu variable arm64: arch_timer: Enable CNTVCT_EL0 trap if workaround is enabled arm64: arch_timer: Workaround for Cortex-A73 erratum 858921 arm64: arch_timer: Allow erratum matching with ACPI OEM information arm64: arch_timer: Add HISILICON_ERRATUM_161010101 ACPI matching data Rafał Miłecki (1): clocksource: Add missing line break to error messages Russell King (2): clocksource/drivers/orion: Read clock rate once clocksource/drivers/orion: Add delay_timer implementation Documentation/arm64/silicon-errata.txt | 1 + .../bindings/timer/cortina,gemini-timer.txt | 22 - .../devicetree/bindings/timer/faraday,fttmr010.txt | 33 ++ .../bindings/timer/rockchip,rk-timer.txt | 12 +- arch/arm/boot/dts/rk3188.dtsi | 17 + arch/arm/boot/dts/rk322x.dtsi | 2 +- arch/arm64/include/asm/arch_timer.h | 43 +- arch/arm64/include/asm/cpucaps.h | 3 +- arch/arm64/include/asm/cputype.h | 2 + arch/arm64/include/asm/esr.h | 2 + arch/arm64/kernel/cpu_errata.c | 15 + arch/arm64/kernel/cpufeature.c | 13 +- arch/arm64/kernel/traps.c | 14 + drivers/clocksource/Kconfig | 19 +- drivers/clocksource/Makefile | 2 +- drivers/clocksource/arc_timer.c | 14 +- drivers/clocksource/arm_arch_timer.c | 537 +++++++++++++++------ drivers/clocksource/asm9260_timer.c | 2 +- drivers/clocksource/bcm2835_timer.c | 6 +- drivers/clocksource/bcm_kona_timer.c | 2 +- drivers/clocksource/clksrc-probe.c | 2 +- drivers/clocksource/dw_apb_timer.c | 2 +- drivers/clocksource/meson6_timer.c | 4 +- drivers/clocksource/mips-gic-timer.c | 2 +- drivers/clocksource/nomadik-mtu.c | 8 +- drivers/clocksource/pxa_timer.c | 6 +- drivers/clocksource/rockchip_timer.c | 218 ++++++--- drivers/clocksource/samsung_pwm_timer.c | 6 +- drivers/clocksource/sun4i_timer.c | 10 +- drivers/clocksource/tegra20_timer.c | 2 +- drivers/clocksource/time-armada-370-xp.c | 16 +- drivers/clocksource/time-efm32.c | 2 +- drivers/clocksource/time-orion.c | 34 +- drivers/clocksource/timer-atmel-pit.c | 2 +- drivers/clocksource/timer-digicolor.c | 6 +- .../{timer-gemini.c => timer-fttmr010.c} | 164 ++++--- drivers/clocksource/timer-integrator-ap.c | 4 +- drivers/clocksource/timer-nps.c | 6 +- drivers/clocksource/timer-prima2.c | 10 +- drivers/clocksource/timer-sp804.c | 4 +- drivers/clocksource/timer-sun5i.c | 6 +- drivers/clocksource/vf_pit_timer.c | 2 +- 42 files changed, 875 insertions(+), 402 deletions(-) delete mode 100644 Documentation/devicetree/bindings/timer/cortina,gemini-timer.txt create mode 100644 Documentation/devicetree/bindings/timer/faraday,fttmr010.txt rename drivers/clocksource/{timer-gemini.c => timer-fttmr010.c} (72%) -- <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> Blog