Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit 0dfca419 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'renesas-clocksource-for-v3.10' of...

Merge tag 'renesas-clocksource-for-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

 into next/drivers

From Simon Horman <horms@verge.net.au>:

Renesas ARM and SH based SoC clocksource update for v3.10

I has been agreed by Paul Mundt and myself, that it would be best to take
these changes through the renesas tree and in turn the arm-soc tree.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>

* tag 'renesas-clocksource-for-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  clocksource: sh_mtu2: Set initcall level to subsys
  clocksource: em_sti: Set initcall level to subsys
  clocksource: sh_tmu: Set initcall level to subsys
  clocksource: sh_cmt: Set initcall level to subsys
  clocksource: sh_cmt: Add CMT register layout comment
  clocksource: sh_cmt: Add control register callbacks
  clocksource: sh_cmt: CMCNT and CMCOR register access update
  clocksource: sh_cmt: CMSTR and CMCSR register access update
  clocksource: sh_cmt: Consolidate platform_set_drvdata() call
  clocksource: sh_cmt: Introduce per-register functions
  clocksource: sh_cmt: Initialize 'max_match_value' and 'lock' in sh_cmt_setup()
  clocksource: sh_cmt: Take care of clk_put() when setup_irq() fails
parents c16c4c4b 342896a5
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment