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/mach-omap2/common.c | |
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/mach-omap2/common.c')
-rw-r--r-- | arch/arm/mach-omap2/common.c | 20 |
1 files changed, 20 insertions, 0 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 @@ | |||
16 | #include <linux/init.h> | 16 | #include <linux/init.h> |
17 | #include <linux/clk.h> | 17 | #include <linux/clk.h> |
18 | #include <linux/io.h> | 18 | #include <linux/io.h> |
19 | #include <linux/platform_data/dsp-omap.h> | ||
19 | 20 | ||
20 | #include <plat/clock.h> | 21 | #include <plat/clock.h> |
22 | #include <plat/omap-secure.h> | ||
23 | #include <plat/vram.h> | ||
21 | 24 | ||
22 | #include "soc.h" | 25 | #include "soc.h" |
23 | #include "iomap.h" | 26 | #include "iomap.h" |
@@ -200,3 +203,20 @@ void __init omap5_map_io(void) | |||
200 | omap5_map_common_io(); | 203 | omap5_map_common_io(); |
201 | } | 204 | } |
202 | #endif | 205 | #endif |
206 | |||
207 | /* | ||
208 | * Stub function for OMAP2 so that common files | ||
209 | * continue to build when custom builds are used | ||
210 | */ | ||
211 | int __weak omap_secure_ram_reserve_memblock(void) | ||
212 | { | ||
213 | return 0; | ||
214 | } | ||
215 | |||
216 | void __init omap_reserve(void) | ||
217 | { | ||
218 | omap_vram_reserve_sdram_memblock(); | ||
219 | omap_dsp_reserve_sdram_memblock(); | ||
220 | omap_secure_ram_reserve_memblock(); | ||
221 | omap_barrier_reserve_memblock(); | ||
222 | } | ||