lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ARM: omap: Setup consistent dma size at boot time

Browse Source 
Signed-off-by: Jon Medhurst <tixy@yxit.co.uk>
CC: Tony Lindgren <tony@atomide.com>
This commit is contained in:
Jon Medhurst
2011-08-03 16:57:19 +01:00
parent 99d1717dd7
commit 009426a0eb
5 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/mach-omap1/io.c
View File

@@ -121,6 +121,7 @@ void __init omap1_map_common_io(void)
#endif #endif
omap_sram_init(); omap_sram_init();
omap_init_consistent_dma_size();
} }
/* /*

2
arch/arm/mach-omap2/io.c
View File

@@ -16,7 +16,6 @@
* it under the terms of the GNU General Public License version 2 as * it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation. * published by the Free Software Foundation.
*/ */
#include <linux/module.h> #include <linux/module.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/init.h> #include <linux/init.h>
@@ -250,6 +249,7 @@ static void __init _omap2_map_common_io(void)
omap2_check_revision(); omap2_check_revision();
omap_sram_init(); omap_sram_init();
omap_init_consistent_dma_size();
} }
#ifdef CONFIG_SOC_OMAP2420 #ifdef CONFIG_SOC_OMAP2420

2
arch/arm/plat-omap/include/plat/io.h
View File

@@ -309,6 +309,8 @@ extern void omap2_init_common_devices(struct omap_sdrc_params *sdrc_cs0,
void __iomem *omap_ioremap(unsigned long phys, size_t size, unsigned int type); void __iomem *omap_ioremap(unsigned long phys, size_t size, unsigned int type);
void omap_iounmap(volatile void __iomem *addr); void omap_iounmap(volatile void __iomem *addr);
extern void __init omap_init_consistent_dma_size(void);
#endif #endif
#endif #endif

13
arch/arm/plat-omap/include/plat/memory.h
View File

@@ -85,18 +85,5 @@
#endif /* CONFIG_ARCH_OMAP15XX */ #endif /* CONFIG_ARCH_OMAP15XX */
/* Override the ARM default */
#ifdef CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE
#if (CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE == 0)
#undef CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE
#define CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE 2
#endif
#define CONSISTENT_DMA_SIZE \
(((CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE + 1) & ~1) * 1024 * 1024)
#endif
#endif #endif

8
arch/arm/plat-omap/io.c
View File

@@ -12,6 +12,7 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/dma-mapping.h>
#include <plat/omap7xx.h> #include <plat/omap7xx.h>
#include <plat/omap1510.h> #include <plat/omap1510.h>
@@ -139,3 +140,10 @@ void omap_iounmap(volatile void __iomem *addr)
__iounmap(addr); __iounmap(addr);
} }
EXPORT_SYMBOL(omap_iounmap); EXPORT_SYMBOL(omap_iounmap);
void __init omap_init_consistent_dma_size(void)
{
#ifdef CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE
init_consistent_dma_size(CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE << 20);
#endif
}