diff options
Diffstat (limited to 'arch/arm/mach-omap2/common.c')
-rw-r--r-- | arch/arm/mach-omap2/common.c | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/common.c b/arch/arm/mach-omap2/common.c index 17950c6e130b..34fb5b95859b 100644 --- a/arch/arm/mach-omap2/common.c +++ b/arch/arm/mach-omap2/common.c | |||
@@ -16,14 +16,17 @@ | |||
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/vram.h> |
21 | 22 | ||
22 | #include "soc.h" | 23 | #include "soc.h" |
23 | #include "iomap.h" | 24 | #include "iomap.h" |
24 | #include "common.h" | 25 | #include "common.h" |
26 | #include "clock.h" | ||
25 | #include "sdrc.h" | 27 | #include "sdrc.h" |
26 | #include "control.h" | 28 | #include "control.h" |
29 | #include "omap-secure.h" | ||
27 | 30 | ||
28 | /* Global address base setup code */ | 31 | /* Global address base setup code */ |
29 | 32 | ||
@@ -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 | } | ||