diff options
author | Jon Medhurst <tixy@yxit.co.uk> | 2011-08-03 15:57:19 (GMT) |
---|---|---|
committer | Jon Medhurst <tixy@yxit.co.uk> | 2011-08-22 12:00:10 (GMT) |
commit | 009426a0ebd0fc4a230ab2c2295dbc8f7ba7e8dd (patch) | |
tree | 629daf1f542f8361c4a55395bdbf1f8f5da85464 /arch/arm/plat-omap/include | |
parent | 99d1717dd7fecf2b10195b0d864323b952b4eba0 (diff) | |
download | linux-fsl-qoriq-009426a0ebd0fc4a230ab2c2295dbc8f7ba7e8dd.tar.xz |
ARM: omap: Setup consistent dma size at boot time
Signed-off-by: Jon Medhurst <tixy@yxit.co.uk>
CC: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/plat-omap/include')
-rw-r--r-- | arch/arm/plat-omap/include/plat/io.h | 2 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/plat/memory.h | 13 |
2 files changed, 2 insertions, 13 deletions
diff --git a/arch/arm/plat-omap/include/plat/io.h b/arch/arm/plat-omap/include/plat/io.h index d72ec85..ebe67ea 100644 --- a/arch/arm/plat-omap/include/plat/io.h +++ b/arch/arm/plat-omap/include/plat/io.h @@ -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 omap_iounmap(volatile void __iomem *addr); +extern void __init omap_init_consistent_dma_size(void); + #endif #endif diff --git a/arch/arm/plat-omap/include/plat/memory.h b/arch/arm/plat-omap/include/plat/memory.h index e6720aa..7f9df6f 100644 --- a/arch/arm/plat-omap/include/plat/memory.h +++ b/arch/arm/plat-omap/include/plat/memory.h @@ -85,18 +85,5 @@ #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 |