• Arnd Bergmann's avatar
    Merge tag 'omap-devel-dmtimer-for-v3.6' of... · 5351da96
    Arnd Bergmann authored
    Merge tag 'omap-devel-dmtimer-for-v3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/timer
    
    From Tony Lindgren <tony@atomide.com>:
    
    Here are some omap dmtimer changes to make it easier to add
    device tree support for dmtimer by simplifying the platform
    data structure used by dmtimr.
    
    * tag 'omap-devel-dmtimer-for-v3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
      ARM: OMAP2+: Simplify dmtimer clock aliases
      ARM: OMAP2+: Move dmtimer clock set function to dmtimer driver
      ARM: OMAP1: Fix dmtimer support
      ARM: OMAP: Add flag to indicate if a timer needs a manual reset
      ARM: OMAP: Remove timer function pointer for context loss counter
      ARM: OMAP: Remove loses_context variable from timer platform data
      ARM: OMAP2+: Fix external clock support for dmtimers
      ARM: OMAP2+: HWMOD: Correct timer device attributes
      ARM: OMAP: Add DMTIMER capability variable to represent timer features
      ARM: OMAP2+: Add dmtimer platform function to reserve systimers
      ARM: OMAP2+: Remove unused max number of timers definition
      ARM: OMAP: Remove unnecessary clk structure
    Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
    5351da96
clock44xx_data.c 104 KB