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

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

Pull "Third Round of Renesas ARM Based SoC Soc Updates for v3.18" from Simon Horman:

* Initial r8a7794 SoC support
* Support Cortex-A7 in shmobile_init_delay()

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

* tag 'renesas-soc3-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: Initial r8a7794 SoC support
  ARM: shmobile: support Cortex-A7 in shmobile_init_delay()
---

138310e18b70caed1b7acf02a2c97170dcb3c55d
diff --cc arch/arm/mach-shmobile/Kconfig
index 04d9cee4b6b4,05f4cc07dffb..b70d945121f9
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@@ -46,8 -41,16 +46,12 @@@ config ARCH_R8A779
  	select RENESAS_IRQC
  	select SYS_SUPPORTS_SH_CMT
  
+ config ARCH_R8A7794
+ 	bool "R-Car E2 (R8A77940)"
+ 	select ARCH_RCAR_GEN2
+ 
  comment "Renesas ARM SoCs Board Type"
  
 -config MACH_GENMAI
 -	bool "Genmai board"
 -	depends on ARCH_R7S72100
 -
  config MACH_KOELSCH
  	bool "Koelsch board"
  	depends on ARCH_R8A7791