diff options
author | Jon Medhurst <tixy@yxit.co.uk> | 2011-08-04 11:35:26 -0400 |
---|---|---|
committer | Jon Medhurst <tixy@yxit.co.uk> | 2011-08-22 08:00:12 -0400 |
commit | 2d5e975b2194eb1326ea0b90db1e21da7be17708 (patch) | |
tree | 86cf09f7e528c1e577b16f006432a3d001299ff8 /arch/arm/mach-bcmring | |
parent | f407c2e38e5f07d2e8f573fc55a5d996568f6e50 (diff) |
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>
Diffstat (limited to 'arch/arm/mach-bcmring')
-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 @@ | |||
25 | 25 | ||
26 | #define PLAT_PHYS_OFFSET CFG_GLOBAL_RAM_BASE | 26 | #define PLAT_PHYS_OFFSET CFG_GLOBAL_RAM_BASE |
27 | 27 | ||
28 | /* | ||
29 | * Maximum DMA memory allowed is 14M | ||
30 | */ | ||
31 | #define CONSISTENT_DMA_SIZE (SZ_16M - SZ_2M) | ||
32 | |||
33 | #endif | 28 | #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 @@ | |||
13 | *****************************************************************************/ | 13 | *****************************************************************************/ |
14 | 14 | ||
15 | #include <linux/platform_device.h> | 15 | #include <linux/platform_device.h> |
16 | #include <linux/dma-mapping.h> | ||
16 | #include <asm/mach/map.h> | 17 | #include <asm/mach/map.h> |
17 | 18 | ||
18 | #include <mach/hardware.h> | 19 | #include <mach/hardware.h> |
@@ -53,4 +54,6 @@ void __init bcmring_map_io(void) | |||
53 | { | 54 | { |
54 | 55 | ||
55 | iotable_init(bcmring_io_desc, ARRAY_SIZE(bcmring_io_desc)); | 56 | iotable_init(bcmring_io_desc, ARRAY_SIZE(bcmring_io_desc)); |
57 | /* Maximum DMA memory allowed is 14M */ | ||
58 | init_consistent_dma_size(14 << 20); | ||
56 | } | 59 | } |