diff options
| author | Olof Johansson <olof@lixom.net> | 2014-03-17 00:38:40 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-03-17 00:38:40 -0700 |
| commit | 4664f3d339db54680ac0dbc488dc1ff74d91ac8b (patch) | |
| tree | 7ac23d6ab903509c2f5820c3c4a6875d7df42df2 /arch/arm/mach-shmobile/Kconfig | |
| parent | 07cb1ec1ae18828e0b187ef67e9e465623d1ea7b (diff) | |
| parent | c4ca5d80e03559fd95c526ece5ce39fc732a2511 (diff) | |
Merge tag 'renesas-soc2-for-v3.15' of git://git.kernel.org/pub/scm/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>
Diffstat (limited to 'arch/arm/mach-shmobile/Kconfig')
| -rw-r--r-- | arch/arm/mach-shmobile/Kconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig index 8a685edf3bbc..c54db0046ce3 100644 --- a/arch/arm/mach-shmobile/Kconfig +++ b/arch/arm/mach-shmobile/Kconfig @@ -9,6 +9,7 @@ config ARCH_SHMOBILE_MULTI select HAVE_ARM_TWD if SMP select ARM_GIC select MIGHT_HAVE_PCI + select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE select NO_IOPORT select PINCTRL select ARCH_REQUIRE_GPIOLIB @@ -118,6 +119,7 @@ config ARCH_R8A7790 select MIGHT_HAVE_PCI select SH_CLK_CPG select RENESAS_IRQC + select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE config ARCH_R8A7791 bool "R-Car M2 (R8A77910)" @@ -127,6 +129,7 @@ config ARCH_R8A7791 select MIGHT_HAVE_PCI select SH_CLK_CPG select RENESAS_IRQC + select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE config ARCH_EMEV2 bool "Emma Mobile EV2" |