From: Rafael J. Wysocki <rjw@sisk.pl>
Date: Sat, 12 May 2012 20:20:36 +0000 (+0200)
Subject: Merge branch 'renesas-dt' into renesas-soc-core
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=15d2c83948a3f47095017dbcf2060132bcd8c00c;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

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()
---

15d2c83948a3f47095017dbcf2060132bcd8c00c
diff --cc arch/arm/mach-shmobile/include/mach/common.h
index c85e6ecda606,cc1d73514ffa..ff5f12fd742f
--- a/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);