summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-davinci/common.c
diff options
context:
space:
mode:
authorJon Medhurst <tixy@yxit.co.uk>2011-08-04 15:51:45 +0200
committerJon Medhurst <tixy@yxit.co.uk>2011-08-22 14:00:11 +0200
commitfd24f903182b3f2cda39d95574e45aa8983e5770 (patch)
tree32ad1703d6875ecd58cf2bb06bfe41f244199ad5 /arch/arm/mach-davinci/common.c
parentARM: mxc: Remove setting of consistent dma size (diff)
downloadlinux-fd24f903182b3f2cda39d95574e45aa8983e5770.tar.xz
linux-fd24f903182b3f2cda39d95574e45aa8983e5770.zip
ARM: mach-davinci: Setup consistent dma size at boot time
Signed-off-by: Jon Medhurst <tixy@yxit.co.uk> CC: Sekhar Nori <nsekhar@ti.com> CC: Kevin Hilman <khilman@ti.com>
Diffstat (limited to 'arch/arm/mach-davinci/common.c')
-rw-r--r--arch/arm/mach-davinci/common.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-davinci/common.c b/arch/arm/mach-davinci/common.c
index 1d2557394235..865ffe5899ac 100644
--- a/arch/arm/mach-davinci/common.c
+++ b/arch/arm/mach-davinci/common.c
@@ -12,6 +12,7 @@
#include <linux/io.h>
#include <linux/etherdevice.h>
#include <linux/davinci_emac.h>
+#include <linux/dma-mapping.h>
#include <asm/tlb.h>
#include <asm/mach/map.h>
@@ -86,6 +87,8 @@ void __init davinci_common_init(struct davinci_soc_info *soc_info)
iotable_init(davinci_soc_info.io_desc,
davinci_soc_info.io_desc_num);
+ init_consistent_dma_size(14 << 20);
+
/*
* Normally devicemaps_init() would flush caches and tlb after
* mdesc->map_io(), but we must also do it here because of the CPU