From e922fe6625fb4700f041e5984ba6c09a1cadae65 Mon Sep 17 00:00:00 2001 From: Nicolas Pitre Date: Wed, 21 Sep 2011 20:52:40 +0100 Subject: [PATCH] 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 Signed-off-by: Russell King --- arch/arm/mach-prima2/include/mach/memory.h | 7 ------- arch/arm/mach-prima2/prima2.c | 1 + 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/arch/arm/mach-prima2/include/mach/memory.h b/arch/arm/mach-prima2/include/mach/memory.h index 368cd5a0601a..0d5ee6af8c54 100644 --- 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 f57124bdd143..53d7758bf443 100644 --- 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 -- 2.39.5