Merge tag 'renesas-r8a7740-ccf-and-timers-for-v3.18' of git://git.kernel.org/pub...
authorArnd Bergmann <arnd@arndb.de>
Fri, 5 Sep 2014 15:36:52 +0000 (17:36 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 5 Sep 2014 15:36:52 +0000 (17:36 +0200)
commite0ace5fc33e2046e83b0ebbe03b7489eabd6cc03
tree3d274308ff347d26ae740a619cfa14784a5496da
parent59255f4de51e325571d23c8f6f5046069630619f
parent433306747791845677ba662435a9bbbafaa21df3
Merge tag 'renesas-r8a7740-ccf-and-timers-for-v3.18' of git://git./linux/kernel/git/horms/renesas into next/soc

Merge "Renesas ARM Based SoC R8a7740 CCF and Timers Updates for v3.18" from Simon Horman:

When booting using the r8a7740/armadillo800eva using dt-reference:
* Use CCF to initialise clocks via DT
* Initialise timers via DT

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
* tag 'renesas-r8a7740-ccf-and-timers-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: r8a7740: Remove r8a7740_add_standard_devices_dt
  ARM: shmobile: armadillo800eva-reference: Do not use r8a7740_add_standard_devices_dt()
  ARM: shmobile: armadillo800eva-reference: Enable CMT1 in device tree
  ARM: shmobile: r8a7740: Add CMT1 device to DT
  ARM: shmobile: armadillo800eva-reference: add clock overrides to DTS
  ARM: shmobile: r8a7740: add MSTP clock assignments to DT
  ARM: shmobile: r8a7740: add SoC clocks to DTS
  ARM: shmobile: r8a7740: clock register bits