• Arnd Bergmann's avatar
    Merge tag 'omap-for-v3.10/timer-signed' of... · dc2d3db8
    Arnd Bergmann authored
    Merge tag 'omap-for-v3.10/timer-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/drivers
    
    From Tony Lindgren <tony@atomide.com>:
    
    Clean-up for omap2+ timers from Jon Hunter <jon-hunter@ti.com>:
    
    This series consists mainly of clean-ups for clockevents and
    clocksource timers on OMAP2+ devices. The most significant change
    in functionality comes from the 5th patch which is changing the
    selection of the clocksource timer for OMAP3 and AM335x devices
    when gptimers are used for clocksource.
    
    Note that this series depends on 71856843 (ARM: OMAP: use
    consistent error checking) in RMK's tree and 960cba67 (ARM:
    OMAP5: timer: Update the clocksource name as per clock data)
    in omap-for-v3.10/fixes-non-critical. So this branch is based
    on a merge of 71856843 and omap-for-v3.10/fixes-non-critical
    to avoid non-trivial merge conflicts.
    
    * tag 'omap-for-v3.10/timer-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
      ARM: OMAP4+: Fix sparse warning in system timers
      ARM: OMAP2+: Store ID of system timers in timer structure
      ARM: OMAP3: Update clocksource timer selection
      ARM: OMAP2+: Simplify system timers definitions
      ARM: OMAP2+: Simplify system timer clock definitions
      ARM: OMAP2+: Remove hard-coded test on timer ID
      ARM: OMAP2+: Display correct system timer name
      ARM: OMAP2+: fix typo "CONFIG_BRIDGE_DVFS"
      ARM: OMAP1: remove "config MACH_OMAP_HTCWIZARD"
      ARM: OMAP: dpll: enable bypass clock only when attempting dpll bypass
      ARM: OMAP2+: powerdomain: avoid testing whether an unsigned char is less than 0
      ARM: OMAP2+: hwmod: Remove unused _HWMOD_WAKEUP_ENABLED flag
      ARM: OMAP2+: am335x: Change the wdt1 func clk src to per_32k clk
      ARM: OMAP2+: AM33xx: hwmod: Add missing sysc definition to wdt1 entry
    Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
    dc2d3db8
board-cm-t3517.c 8.28 KB