aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSantosh Shilimkar <santosh.shilimkar@ti.com>2013-11-23 16:58:03 -0500
committerSantosh Shilimkar <santosh.shilimkar@ti.com>2013-12-16 16:03:36 -0500
commitdf595a9d70fc3d1f4435b4a643bfaab9913c0ebd (patch)
tree8f9570876b45f49553935f95dcb38a439b9f1094
parent89b3feefa2e0ca2ba09e637a8a23838e9561c3a2 (diff)
ARM: keystone: enable DMA zone for LPAE
Keystone II peripheral devices support 32-bit DMA and hence can access only first 2GB of the memory address space. So set the platform dma_zone_size to handle that case. Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
-rw-r--r--arch/arm/mach-keystone/Kconfig1
-rw-r--r--arch/arm/mach-keystone/keystone.c3
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-keystone/Kconfig b/arch/arm/mach-keystone/Kconfig
index 8a9e943a3240..dabc5eee52e7 100644
--- a/arch/arm/mach-keystone/Kconfig
+++ b/arch/arm/mach-keystone/Kconfig
@@ -12,6 +12,7 @@ config ARCH_KEYSTONE
12 select COMMON_CLK_KEYSTONE 12 select COMMON_CLK_KEYSTONE
13 select TI_EDMA 13 select TI_EDMA
14 select ARCH_SUPPORTS_BIG_ENDIAN 14 select ARCH_SUPPORTS_BIG_ENDIAN
15 select ZONE_DMA if ARM_LPAE
15 help 16 help
16 Support for boards based on the Texas Instruments Keystone family of 17 Support for boards based on the Texas Instruments Keystone family of
17 SoCs. 18 SoCs.
diff --git a/arch/arm/mach-keystone/keystone.c b/arch/arm/mach-keystone/keystone.c
index b661c5c2870a..2fe4dd04996c 100644
--- a/arch/arm/mach-keystone/keystone.c
+++ b/arch/arm/mach-keystone/keystone.c
@@ -68,6 +68,9 @@ void keystone_restart(enum reboot_mode mode, const char *cmd)
68} 68}
69 69
70DT_MACHINE_START(KEYSTONE, "Keystone") 70DT_MACHINE_START(KEYSTONE, "Keystone")
71#if defined(CONFIG_ZONE_DMA) && defined(CONFIG_ARM_LPAE)
72 .dma_zone_size = SZ_2G,
73#endif
71 .smp = smp_ops(keystone_smp_ops), 74 .smp = smp_ops(keystone_smp_ops),
72 .init_machine = keystone_init, 75 .init_machine = keystone_init,
73 .dt_compat = keystone_match, 76 .dt_compat = keystone_match,