• Olof Johansson's avatar
    Merge tag 'omap-for-v3.8/cleanup-timer-signed' of... · c8a1cecc
    Olof Johansson authored
    Merge tag 'omap-for-v3.8/cleanup-timer-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup
    
    Timer clean-up to get us closer to moving timer code to drivers,
    and to get rid of CONFIG_OMAP_32K_TIMER and rely on the board
    or devicetree provided timer configuration.
    
    Note that these changes are on top of the recent timer fixes.
    
    By Jon Hunter (32) and others
    via Tony Lindgren
    * tag 'omap-for-v3.8/cleanup-timer-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (71 commits)
      ARM: OMAP3: cm-t3517: use GPTIMER for system clock
      ARM: OMAP2+: timer: remove CONFIG_OMAP_32K_TIMER
      ARM: OMAP2+: Fix compiler warning for 32k timer
      ARM: OMAP: Remove unnecessary inclusion of dmtimer.h
      ARM: OMAP: Add platform data header for DMTIMERs
      ARM: OMAP: Remove unnecessary omap_dm_timer structure declaration
      ARM: OMAP2+: Remove unnecessary local variable in timer code
      ARM: OMAP: Don't store timers physical address
      ARM: OMAP: Define omap_dm_timer_prepare function as static
      ARM: OMAP: Clean-up dmtimer reset code
      ARM: OMAP: Remove __omap_dm_timer_set_source function
      ARM: OMAP: Remove unnecessary call to clk_get()
      ARM: OMAP: Add dmtimer interrupt disable function
      ARM: OMAP: Fix spurious interrupts when using timer match feature
      ARM: OMAP: Don't restore DMTIMER interrupt status register
      ARM: OMAP: Don't restore of DMTIMER TISTAT register
      ARM: OMAP: Fix dmtimer reset for timer1
      ARM: OMAP2+: Don't use __omap_dm_timer_reset()
      ARM: OMAP2/3: Define HWMOD software reset status for DMTIMERs
      ARM: OMAP3: Correct HWMOD DMTIMER SYSC register declarations
      ...
    
    Change/change conflict in arch/arm/mach-omap2/board-cm-t3517.c.
    Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
    c8a1cecc
common.h 7.64 KB