diff options
| author | Lokesh Vutla <lokeshvutla@ti.com> | 2012-10-01 20:47:05 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-10-19 01:22:22 +0200 |
| commit | f583f0f2c720e4ac7d2ffd65996717bf0345a3e5 (patch) | |
| tree | 79b30e3c770d616e1906cb1a4cce6012538a72d2 /arch | |
| parent | ARM: OMAP1: Remove omap_reserve() callback for all omap1 boards (diff) | |
| download | linux-f583f0f2c720e4ac7d2ffd65996717bf0345a3e5.tar.xz linux-f583f0f2c720e4ac7d2ffd65996717bf0345a3e5.zip | |
ARM: OMAP2+: Move omap_reserve() locally to mach-omap2
omap_reserve() callback is defned only for mach-omap2.
So, moving definition of omap_reserve() to mach-omap2.
This helps is moving plat/omap_secure.h local to
mach-omap2
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-omap2/common.c | 20 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/common.h | 1 | ||||
| -rw-r--r-- | arch/arm/plat-omap/common.c | 21 |
3 files changed, 21 insertions, 21 deletions
diff --git a/arch/arm/mach-omap2/common.c b/arch/arm/mach-omap2/common.c index 17950c6e130b..4ce0d63e941b 100644 --- a/arch/arm/mach-omap2/common.c +++ b/arch/arm/mach-omap2/common.c @@ -16,8 +16,11 @@ #include <linux/init.h> #include <linux/clk.h> #include <linux/io.h> +#include <linux/platform_data/dsp-omap.h> #include <plat/clock.h> +#include <plat/omap-secure.h> +#include <plat/vram.h> #include "soc.h" #include "iomap.h" @@ -200,3 +203,20 @@ void __init omap5_map_io(void) omap5_map_common_io(); } #endif + +/* + * Stub function for OMAP2 so that common files + * continue to build when custom builds are used + */ +int __weak omap_secure_ram_reserve_memblock(void) +{ + return 0; +} + +void __init omap_reserve(void) +{ + omap_vram_reserve_sdram_memblock(); + omap_dsp_reserve_sdram_memblock(); + omap_secure_ram_reserve_memblock(); + omap_barrier_reserve_memblock(); +} diff --git a/arch/arm/mach-omap2/common.h b/arch/arm/mach-omap2/common.h index b91b2a2308aa..42b1b2e009d3 100644 --- a/arch/arm/mach-omap2/common.h +++ b/arch/arm/mach-omap2/common.h @@ -343,6 +343,7 @@ extern void omap_sdrc_init(struct omap_sdrc_params *sdrc_cs0, struct omap_sdrc_params *sdrc_cs1); struct omap2_hsmmc_info; extern int omap4_twl6030_hsmmc_init(struct omap2_hsmmc_info *controllers); +extern void omap_reserve(void); #endif /* __ASSEMBLER__ */ #endif /* __ARCH_ARM_MACH_OMAP2PLUS_COMMON_H */ diff --git a/arch/arm/plat-omap/common.c b/arch/arm/plat-omap/common.c index 2a9db0128a96..a1555e028123 100644 --- a/arch/arm/plat-omap/common.c +++ b/arch/arm/plat-omap/common.c @@ -17,32 +17,11 @@ #include <linux/dma-mapping.h> #include "common.h" -#include <plat/vram.h> -#include <linux/platform_data/dsp-omap.h> #include <plat-omap/dma-omap.h> -#include <plat/omap-secure.h> - -void __init omap_reserve(void) -{ - omap_vram_reserve_sdram_memblock(); - omap_dsp_reserve_sdram_memblock(); - omap_secure_ram_reserve_memblock(); - omap_barrier_reserve_memblock(); -} - 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 } - -/* - * Stub function for OMAP2 so that common files - * continue to build when custom builds are used - */ -int __weak omap_secure_ram_reserve_memblock(void) -{ - return 0; -} |