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/arm/mach-omap2/common.c | |
| 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/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 @@ #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(); +} |