leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ARM: mach-davinci: Setup consistent dma size at boot time

Browse Source 
Signed-off-by: Jon Medhurst <tixy@yxit.co.uk>
CC: Sekhar Nori <nsekhar@ti.com>
CC: Kevin Hilman <khilman@ti.com>
This commit is contained in:
Jon Medhurst
2011-08-04 14:51:45 +01:00
parent 389d12cc7f
commit fd24f90318
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm/mach-davinci/common.c
View File

@@ -12,6 +12,7 @@
#include <linux/io.h> #include <linux/io.h>
#include <linux/etherdevice.h> #include <linux/etherdevice.h>
#include <linux/davinci_emac.h> #include <linux/davinci_emac.h>
#include <linux/dma-mapping.h>
#include <asm/tlb.h> #include <asm/tlb.h>
#include <asm/mach/map.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, iotable_init(davinci_soc_info.io_desc,
davinci_soc_info.io_desc_num); davinci_soc_info.io_desc_num);
init_consistent_dma_size(14 << 20);
/* /*
* Normally devicemaps_init() would flush caches and tlb after * Normally devicemaps_init() would flush caches and tlb after
* mdesc->map_io(), but we must also do it here because of the CPU * mdesc->map_io(), but we must also do it here because of the CPU

5
arch/arm/mach-davinci/include/mach/memory.h
View File

@@ -36,9 +36,4 @@
#define DDR2_MCLKSTOPEN_BIT BIT(30) #define DDR2_MCLKSTOPEN_BIT BIT(30)
#define DDR2_LPMODEN_BIT BIT(31) #define DDR2_LPMODEN_BIT BIT(31)
/*
* Increase size of DMA-consistent memory region
*/
#define CONSISTENT_DMA_SIZE (14<<20)
#endif /* __ASM_ARCH_MEMORY_H */ #endif /* __ASM_ARCH_MEMORY_H */