Merge branch 'renesas-dt' into renesas-soc-core

* renesas-dt:
  ARM: mach-shmobile: sh7372 generic board support via DT V2
  ARM: mach-shmobile: Rework sh7372 INTCS demuxer V2
  ARM: mach-shmobile: Use INTC_IRQ_PINS_16H on sh7372
  ARM: mach-shmobile: Use 0x3400 as INTCS vector offset
  ARM: mach-shmobile: Introduce INTC_IRQ_PINS_16H
  ARM: mach-shmobile: Introduce shmobile_setup_delay()

diff --cc arch/arm/mach-shmobile/include/mach/common.h
index c85e6ecda606be97b7f951aea269b65630c11852,cc1d73514ffa189523fa3bebf7c167f405091ab7..ff5f12fd742fb737c923eb2210cebcdafed5a537
--- 1/arch/arm/mach-shmobile/include/mach/common.h
--- 2/arch/arm/mach-shmobile/include/mach/common.h
+++ b/arch/arm/mach-shmobile/include/mach/common.h
@@@ -3,7 -3,10 +3,9 @@@
  
  extern void shmobile_earlytimer_init(void);
  extern struct sys_timer shmobile_timer;
+ extern void shmobile_setup_delay(unsigned int max_cpu_core_mhz,
+                                unsigned int mult, unsigned int div);
  struct twd_local_timer;
 -void shmobile_twd_init(struct twd_local_timer *twd_local_timer);
  extern void shmobile_setup_console(void);
  extern void shmobile_secondary_vector(void);
  extern int shmobile_platform_cpu_kill(unsigned int cpu);

diff --cc arch/arm/mach-shmobile/timer.c
Simple merge