From: Olof Johansson <olof@lixom.net>
Date: Mon, 17 Mar 2014 07:38:40 +0000 (-0700)
Subject: Merge tag 'renesas-soc2-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=4664f3d339db54680ac0dbc488dc1ff74d91ac8b;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

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

Merge "Second Round of Renesas ARM Based SoC Updates for v3.15" from Simon
Horman:

* R-Car Gen2 SoCs: r8a7791 (R-Car M2) and r8a7790 (R-Car H2)
  - Remove __init from rcar_gen2_read_mode_pins()

* r8a7791 (R-Car M2)
  - Use 64-bit dma_addr_t

* r8a7790 (R-Car H2)
  - Add CA15-SCU, CA7-SCU
  - Add SYSC setup code
  - Use 64-bit dma_addr_t

* tag 'renesas-soc2-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: Move SYSC base variable to inside ifdefs
  ARM: shmobile: Remove __init from rcar_gen2_read_mode_pins()
  ARM: shmobile: r8a7790 CA15-SCU enablement
  ARM: shmobile: r8a7790 CA7-SCU enablement
  ARM: shmobile: r8a7790 SYSC setup code
  ARM: shmobile: Break out R-Car SYSC PM code
  ARM: shmobile: Use 64-bit dma_addr_t on r8a7790/r8a7791

Signed-off-by: Olof Johansson <olof@lixom.net>
---

4664f3d339db54680ac0dbc488dc1ff74d91ac8b
diff --cc arch/arm/mach-shmobile/Kconfig
index 8a685edf3bbc,0272cd7b6f27..c54db0046ce3
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@@ -5,10 -5,15 +5,11 @@@ config ARCH_SHMOBILE_MULT
  	bool "Renesas ARM SoCs" if ARCH_MULTI_V7
  	depends on MMU
  	select ARCH_SHMOBILE
 -	select CPU_V7
 -	select GENERIC_CLOCKEVENTS
  	select HAVE_ARM_SCU if SMP
 -	select HAVE_ARM_TWD if LOCAL_TIMERS
 -	select HAVE_SMP
 +	select HAVE_ARM_TWD if SMP
  	select ARM_GIC
 -	select MIGHT_HAVE_CACHE_L2X0
  	select MIGHT_HAVE_PCI
+ 	select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE
  	select NO_IOPORT
  	select PINCTRL
  	select ARCH_REQUIRE_GPIOLIB