diff options
author | Lokesh Vutla <lokeshvutla@ti.com> | 2012-10-01 14:47:05 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2012-10-18 19:22:22 -0400 |
commit | f583f0f2c720e4ac7d2ffd65996717bf0345a3e5 (patch) | |
tree | 79b30e3c770d616e1906cb1a4cce6012538a72d2 /arch/arm/plat-omap | |
parent | f300af86a85c69fb1552b5389f968ea1a3e0a3eb (diff) |
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/arm/plat-omap')
-rw-r--r-- | arch/arm/plat-omap/common.c | 21 |
1 files changed, 0 insertions, 21 deletions
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 @@ | |||
17 | #include <linux/dma-mapping.h> | 17 | #include <linux/dma-mapping.h> |
18 | 18 | ||
19 | #include "common.h" | 19 | #include "common.h" |
20 | #include <plat/vram.h> | ||
21 | #include <linux/platform_data/dsp-omap.h> | ||
22 | #include <plat-omap/dma-omap.h> | 20 | #include <plat-omap/dma-omap.h> |
23 | 21 | ||
24 | #include <plat/omap-secure.h> | ||
25 | |||
26 | void __init omap_reserve(void) | ||
27 | { | ||
28 | omap_vram_reserve_sdram_memblock(); | ||
29 | omap_dsp_reserve_sdram_memblock(); | ||
30 | omap_secure_ram_reserve_memblock(); | ||
31 | omap_barrier_reserve_memblock(); | ||
32 | } | ||
33 | |||
34 | void __init omap_init_consistent_dma_size(void) | 22 | void __init omap_init_consistent_dma_size(void) |
35 | { | 23 | { |
36 | #ifdef CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE | 24 | #ifdef CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE |
37 | init_consistent_dma_size(CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE << 20); | 25 | init_consistent_dma_size(CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE << 20); |
38 | #endif | 26 | #endif |
39 | } | 27 | } |
40 | |||
41 | /* | ||
42 | * Stub function for OMAP2 so that common files | ||
43 | * continue to build when custom builds are used | ||
44 | */ | ||
45 | int __weak omap_secure_ram_reserve_memblock(void) | ||
46 | { | ||
47 | return 0; | ||
48 | } | ||