From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 5 Sep 2014 15:40:32 +0000 (+0200)
Subject: Merge tag 'renesas-dt-timers-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=09d12ad7936df431ecbf0faf2b81c56cc4bb6392;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'renesas-dt-timers-for-v3.18' of git://git./linux/kernel/git/horms/renesas into next/soc

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

* Enable timers using DT when booting boards without Legacy-C code

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

* tag 'renesas-dt-timers-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: genmai-reference: Enable MTU2 in device tree
  ARM: shmobile: r7s72100: Add MTU2 device to DT
  ARM: shmobile: marzen-reference: Enable TMU0 in device tree
  ARM: shmobile: koelsch-reference: Enable CMT0 in device tree
  ARM: shmobile: lager-reference: Enable CMT0 in device tree
  ARM: shmobile: r8a7779: Add TMU devices to DT
  ARM: shmobile: r8a7791: Add CMT devices to DT
  ARM: shmobile: r8a7790: Add CMT devices to DT

Conflicts:
	arch/arm/mach-shmobile/setup-r8a7779.c
---

09d12ad7936df431ecbf0faf2b81c56cc4bb6392
diff --cc arch/arm/mach-shmobile/setup-r8a7779.c
index 6829cd19ea72,11ceee607464..136078ab9407
--- a/arch/arm/mach-shmobile/setup-r8a7779.c
+++ b/arch/arm/mach-shmobile/setup-r8a7779.c
@@@ -771,9 -765,9 +765,8 @@@ static const char *r8a7779_compat_dt[] 
  DT_MACHINE_START(R8A7779_DT, "Generic R8A7779 (Flattened Device Tree)")
  	.map_io		= r8a7779_map_io,
  	.init_early	= shmobile_init_delay,
 -	.nr_irqs	= NR_IRQS_LEGACY,
  	.init_irq	= r8a7779_init_irq_dt,
- 	.init_machine	= r8a7779_add_standard_devices_dt,
 -	.init_late	= r8a7779_init_late,
 +	.init_late	= shmobile_init_late,
  	.dt_compat	= r8a7779_compat_dt,
  MACHINE_END
  #endif /* CONFIG_USE_OF */