Merge tag 'renesas-dt-timers2-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel...
authorArnd Bergmann <arnd@arndb.de>
Thu, 11 Sep 2014 07:45:18 +0000 (09:45 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 11 Sep 2014 07:45:18 +0000 (09:45 +0200)
commit60f91268ee29bd2303d94e8e86be40edc0ecb92d
treeba2c976c3b30438eb415cc9e725ed51fb5a37e8e
parent138310e18b70caed1b7acf02a2c97170dcb3c55d
parent48a0d1e07d99ecfd1e5922dd22986d5813f17207
Merge tag 'renesas-dt-timers2-for-v3.18' of git://git./linux/kernel/git/horms/renesas into next/soc

Pull "Second Round of Renesas ARM Based SoC DT Timers Updates for v3.18" from Simon Horman:

* kzm9g-reference: Enable CMT1 in device tree
* Use SoC-specific timer compat strings

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
* tag 'renesas-dt-timers2-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: kzm9g-reference: Enable CMT1 in device tree
  ARM: shmobile: sh73a0: Add CMT1 device to DT
  ARM: shmobile: r8a7740: Use SoC-specific 48-bit CMT compat string
  ARM: shmobile: r8a7779: Use SoC-specific TMU compat string
  ARM: shmobile: r8a7791: Use SoC-specific 48-bit CMT compat string
  ARM: shmobile: r7s72100: Use SoC-specific MTU2 compat string
  ARM: shmobile: r8a7790: Use SoC-specific 48-bit CMT compat string
arch/arm/boot/dts/sh73a0.dtsi
arch/arm/mach-shmobile/setup-sh73a0.c