summaryrefslogtreecommitdiffstats
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)
downloadblackbird-op-linux-df595a9d70fc3d1f4435b4a643bfaab9913c0ebd.tar.gz
blackbird-op-linux-df595a9d70fc3d1f4435b4a643bfaab9913c0ebd.zip
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
select COMMON_CLK_KEYSTONE
select TI_EDMA
select ARCH_SUPPORTS_BIG_ENDIAN
+ select ZONE_DMA if ARM_LPAE
help
Support for boards based on the Texas Instruments Keystone family of
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)
}
DT_MACHINE_START(KEYSTONE, "Keystone")
+#if defined(CONFIG_ZONE_DMA) && defined(CONFIG_ARM_LPAE)
+ .dma_zone_size = SZ_2G,
+#endif
.smp = smp_ops(keystone_smp_ops),
.init_machine = keystone_init,
.dt_compat = keystone_match,
OpenPOWER on IntegriCloud