• Linus Torvalds's avatar
    Merge tag 'timer' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 48d55441
    Linus Torvalds authored
    Pull "ARM: timer cleanup work" from Arnd Bergmann:
     "These are split out from the generic soc and driver updates because
      there was a lot of conflicting work by multiple people.  Marc Zyngier
      worked on simplifying the "localtimer" interfaces, and some of the
      platforms are touching the same code as they move to device tree based
      booting.
    
      Signed-off-by: Arnd Bergmann <arnd@arndb.de>"
    
    * tag 'timer' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (61 commits)
      ARM: tegra: select USB_ULPI if USB is selected
      arm/tegra: pcie: fix return value of function
      ARM: ux500: fix compilation after local timer rework
      ARM: shmobile: remove additional __io() macro use
      ARM: local timers: make the runtime registration interface mandatory
      ARM: local timers: convert MSM to runtime registration interface
      ARM: local timers: convert exynos to runtime registration interface
      ARM: smp_twd: remove old local timer interface
      ARM: imx6q: convert to twd_local_timer_register() interface
      ARM: highbank: convert to twd_local_timer_register() interface
      ARM: ux500: convert to twd_local_timer_register() interface
      ARM: shmobile: convert to twd_local_timer_register() interface
      ARM: tegra: convert to twd_local_timer_register() interface
      ARM: plat-versatile: convert to twd_local_timer_register() interface
      ARM: OMAP4: convert to twd_local_timer_register() interface
      ARM: smp_twd: add device tree support
      ARM: smp_twd: add runtime registration support
      ARM: local timers: introduce a new registration interface
      ARM: smp_twd: make local_timer_stop a symbol instead of a #define
      ARM: mach-shmobile: default to no earlytimer
      ...
    48d55441
mach-imx6q.c 3.44 KB