aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-u300
diff options
context:
space:
mode:
authorJon Medhurst <tixy@yxit.co.uk>2011-08-04 10:41:42 -0400
committerJon Medhurst <tixy@yxit.co.uk>2011-08-22 08:00:11 -0400
commitd70a5969e9d52ef1c0e19a1b154785f8e1acba29 (patch)
tree9f388541062ce5d9f8fdebe048e8499981d622d6 /arch/arm/mach-u300
parentfd24f903182b3f2cda39d95574e45aa8983e5770 (diff)
ARM: mach-u300: Setup consistent dma size at boot time
Signed-off-by: Jon Medhurst <tixy@yxit.co.uk> Acked-by: Linus Walleij <linus.walleij@stericsson.com>
Diffstat (limited to 'arch/arm/mach-u300')
-rw-r--r--arch/arm/mach-u300/core.c3
-rw-r--r--arch/arm/mach-u300/include/mach/memory.h5
2 files changed, 3 insertions, 5 deletions
diff --git a/arch/arm/mach-u300/core.c b/arch/arm/mach-u300/core.c
index 399c89f14dfb..376b6dfdfae9 100644
--- a/arch/arm/mach-u300/core.c
+++ b/arch/arm/mach-u300/core.c
@@ -25,6 +25,7 @@
25#include <linux/err.h> 25#include <linux/err.h>
26#include <linux/mtd/nand.h> 26#include <linux/mtd/nand.h>
27#include <linux/mtd/fsmc.h> 27#include <linux/mtd/fsmc.h>
28#include <linux/dma-mapping.h>
28 29
29#include <asm/types.h> 30#include <asm/types.h>
30#include <asm/setup.h> 31#include <asm/setup.h>
@@ -92,6 +93,8 @@ static struct map_desc u300_io_desc[] __initdata = {
92void __init u300_map_io(void) 93void __init u300_map_io(void)
93{ 94{
94 iotable_init(u300_io_desc, ARRAY_SIZE(u300_io_desc)); 95 iotable_init(u300_io_desc, ARRAY_SIZE(u300_io_desc));
96 /* We enable a real big DMA buffer if need be. */
97 init_consistent_dma_size(SZ_4M);
95} 98}
96 99
97/* 100/*
diff --git a/arch/arm/mach-u300/include/mach/memory.h b/arch/arm/mach-u300/include/mach/memory.h
index 888e2e351ee1..38741da0d261 100644
--- a/arch/arm/mach-u300/include/mach/memory.h
+++ b/arch/arm/mach-u300/include/mach/memory.h
@@ -34,9 +34,4 @@
34 (CONFIG_MACH_U300_ACCESS_MEM_SIZE & 1))*1024*1024 + 0x100) 34 (CONFIG_MACH_U300_ACCESS_MEM_SIZE & 1))*1024*1024 + 0x100)
35#endif 35#endif
36 36
37/*
38 * We enable a real big DMA buffer if need be.
39 */
40#define CONSISTENT_DMA_SIZE SZ_4M
41
42#endif 37#endif