ARM: 7093/1: mach-prima2: move ARM_DMA_ZONE_SIZE to mdesc->dma_zone_size

The branch that contained the ARM_DMA_ZONE_SIZE removal missed prima2.

Original comment:

  Restrict DMA-able region to workaround silicon limitation.
  The limitation restricts buffers available for DMA to SD/MMC
  hardware to be below 256MB.

Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

diff --git a/arch/arm/mach-prima2/include/mach/memory.h b/arch/arm/mach-prima2/include/mach/memory.h
index 368cd5a0601a8ef7020caac926bd2a06cccc37b3..0d5ee6af8c54cdbffe0f3f6bf1d3a96661f92dca 100644 (file)
--- a/arch/arm/mach-prima2/include/mach/memory.h
+++ b/arch/arm/mach-prima2/include/mach/memory.h
@@ -11,11 +11,4 @@
 
 #define PLAT_PHYS_OFFSET        UL(0x00000000)
 
-/*
- * Restrict DMA-able region to workaround silicon limitation.
- * The limitation restricts buffers available for DMA to SD/MMC
- * hardware to be below 256MB
- */
-#define ARM_DMA_ZONE_SIZE      (SZ_256M)
-
 #endif

diff --git a/arch/arm/mach-prima2/prima2.c b/arch/arm/mach-prima2/prima2.c
index f57124bdd1439e2d366a2be01a100164910793e5..53d7758bf44379df47b730679ae86acb09e838fd 100644 (file)
--- a/arch/arm/mach-prima2/prima2.c
+++ b/arch/arm/mach-prima2/prima2.c
@@ -36,6 +36,7 @@ MACHINE_START(PRIMA2_EVB, "prima2cb")
        .map_io         = sirfsoc_map_lluart,
        .init_irq       = sirfsoc_of_irq_init,
        .timer          = &sirfsoc_timer,
+       .dma_zone_size  = SZ_256M,
        .init_machine   = sirfsoc_mach_init,
        .dt_compat      = prima2cb_dt_match,
 MACHINE_END