Merge tag 'renesas-dt-timers2-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel...

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

diff --cc arch/arm/boot/dts/sh73a0.dtsi
Simple merge

diff --cc arch/arm/mach-shmobile/setup-sh73a0.c
index 00853053f5b68a806de660a649449b29e216951b,928e96ae3e099c7cdc17ca57d7a431b0bceff78e..b7bd8e50966879608cde0e5c152cefb12185d9f1
--- 1/arch/arm/mach-shmobile/setup-sh73a0.c
--- 2/arch/arm/mach-shmobile/setup-sh73a0.c
+++ b/arch/arm/mach-shmobile/setup-sh73a0.c
@@@ -779,9 -771,12 +772,7 @@@ void __init sh73a0_add_standard_devices
        /* clocks are setup late during boot in the case of DT */
        sh73a0_clock_init();
  
-       platform_add_devices(sh73a0_devices_dt,
-                            ARRAY_SIZE(sh73a0_devices_dt));
        of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
 -
 -      /* Instantiate cpufreq-cpu0 */
 -      platform_device_register_full(&devinfo);
  }
  
  static const char *sh73a0_boards_compat_dt[] __initdata = {