| From 262a29e6602a74abfc6115e48c9204659301a720 Mon Sep 17 00:00:00 2001 |
| From: Magnus Damm <damm@opensource.se> |
| Date: Wed, 5 Feb 2014 14:36:28 +0900 |
| Subject: ARM: shmobile: Use 64-bit dma_addr_t on r8a7790/r8a7791 |
| |
| Some on-chip devices on r8a7790 and r8a7791 can do |
| bus mastering and access more than 32-bits of address |
| space. Select ARCH_DMA_ADDR_T_64BIT when LPAE is set |
| in case of multiplatform and legacy SoC support. |
| |
| Signed-off-by: Magnus Damm <damm@opensource.se> |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| (cherry picked from commit 4a51856b42672cfcb7d6fbab22dcf2caba2be5ab) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/mach-shmobile/Kconfig | 3 +++ |
| 1 file changed, 3 insertions(+) |
| |
| diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig |
| index 1ebf839fa2b8..08ec4ffc17ee 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 |
| @@ -111,6 +112,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)" |
| @@ -120,6 +122,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" |
| -- |
| 2.1.2 |
| |
