• Linus Torvalds's avatar
    Merge branch 'timers/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · a4ae54f9
    Linus Torvalds authored
    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
    a4ae54f9
armada-370-xp.c 1.65 KB