Merge branch 'timers/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer code update from Thomas Gleixner: - armada SoC clocksource overhaul with a trivial merge conflict - Minor improvements to various SoC clocksource drivers * 'timers/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: clocksource: armada-370-xp: Add detailed clock requirements in devicetree binding clocksource: armada-370-xp: Get reference fixed-clock by name clocksource: armada-370-xp: Replace WARN_ON with BUG_ON clocksource: armada-370-xp: Fix device-tree binding clocksource: armada-370-xp: Introduce new compatibles clocksource: armada-370-xp: Use CLOCKSOURCE_OF_DECLARE clocksource: armada-370-xp: Simplify TIMER_CTRL register access clocksource: armada-370-xp: Use BIT() ARM: timer-sp: Set dynamic irq affinity ARM: nomadik: add dynamic irq flag to the timer clocksource: sh_cmt: 32-bit control register support clocksource: em_sti: Convert to devm_* managed helpers
No related branches found
No related tags found
Showing
- Documentation/devicetree/bindings/timer/marvell,armada-370-xp-timer.txt 31 additions, 5 deletions...devicetree/bindings/timer/marvell,armada-370-xp-timer.txt
- arch/arm/common/timer-sp.c 2 additions, 1 deletionarch/arm/common/timer-sp.c
- arch/arm/mach-mvebu/armada-370-xp.c 2 additions, 2 deletionsarch/arm/mach-mvebu/armada-370-xp.c
- drivers/clocksource/em_sti.c 14 additions, 35 deletionsdrivers/clocksource/em_sti.c
- drivers/clocksource/nomadik-mtu.c 2 additions, 1 deletiondrivers/clocksource/nomadik-mtu.c
- drivers/clocksource/sh_cmt.c 36 additions, 14 deletionsdrivers/clocksource/sh_cmt.c
- drivers/clocksource/time-armada-370-xp.c 77 additions, 54 deletionsdrivers/clocksource/time-armada-370-xp.c
- include/linux/time-armada-370-xp.h 0 additions, 16 deletionsinclude/linux/time-armada-370-xp.h
Loading
Please register or sign in to comment