diff options
| author | Jon Medhurst <tixy@yxit.co.uk> | 2011-08-04 19:35:26 +0400 |
|---|---|---|
| committer | Jon Medhurst <tixy@yxit.co.uk> | 2011-08-22 16:00:12 +0400 |
| commit | 2d5e975b2194eb1326ea0b90db1e21da7be17708 (patch) | |
| tree | 86cf09f7e528c1e577b16f006432a3d001299ff8 | |
| parent | f407c2e38e5f07d2e8f573fc55a5d996568f6e50 (diff) | |
| download | linux-2d5e975b2194eb1326ea0b90db1e21da7be17708.tar.xz | |
ARM: mach-bcmring: Setup consistent dma size at boot time
Signed-off-by: Jon Medhurst <tixy@yxit.co.uk>
CC: Jiandong Zheng <jdzheng@broadcom.com>
CC: Scott Branden <sbranden@broadcom.com>
| -rw-r--r-- | arch/arm/mach-bcmring/include/mach/memory.h | 5 | ||||
| -rw-r--r-- | arch/arm/mach-bcmring/mm.c | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/arch/arm/mach-bcmring/include/mach/memory.h b/arch/arm/mach-bcmring/include/mach/memory.h index 15162e4c75f9..8848a5bb3445 100644 --- a/arch/arm/mach-bcmring/include/mach/memory.h +++ b/arch/arm/mach-bcmring/include/mach/memory.h @@ -25,9 +25,4 @@ #define PLAT_PHYS_OFFSET CFG_GLOBAL_RAM_BASE -/* - * Maximum DMA memory allowed is 14M - */ -#define CONSISTENT_DMA_SIZE (SZ_16M - SZ_2M) - #endif diff --git a/arch/arm/mach-bcmring/mm.c b/arch/arm/mach-bcmring/mm.c index 0f1c37e4523a..8616876abb9f 100644 --- a/arch/arm/mach-bcmring/mm.c +++ b/arch/arm/mach-bcmring/mm.c @@ -13,6 +13,7 @@ *****************************************************************************/ #include <linux/platform_device.h> +#include <linux/dma-mapping.h> #include <asm/mach/map.h> #include <mach/hardware.h> @@ -53,4 +54,6 @@ void __init bcmring_map_io(void) { iotable_init(bcmring_io_desc, ARRAY_SIZE(bcmring_io_desc)); + /* Maximum DMA memory allowed is 14M */ + init_consistent_dma_size(14 << 20); } |