[PATCH 3/4] ARM: OMAP: Move omap_reserve() locally to mach-omap1/2
From: Lokesh Vutla <hidden>
Date: 2012-09-28 13:40:08
Also in:
linux-omap
Subsystem:
arm port, omap1 support, omap2+ support, the rest · Maintainers:
Russell King, Aaro Koskinen, Janusz Krzysztofik, Andreas Kemnade, Kevin Hilman, Roger Quadros, Tony Lindgren, Linus Torvalds
omap_reserve() is a stub for omap1. So creating a stub locally in mach-omap1. And moving the definition to mach-omap2. This helps in moving plat/omap_secure.h local to mach-omap2 Signed-off-by: Lokesh Vutla <redacted> Acked-by : Santosh Shilimkar [off-list ref] --- arch/arm/mach-omap1/common.h | 3 +++ arch/arm/mach-omap2/common.c | 20 ++++++++++++++++++++ arch/arm/mach-omap2/common.h | 1 + arch/arm/plat-omap/common.c | 17 ----------------- arch/arm/plat-omap/include/plat/common.h | 1 - 5 files changed, 24 insertions(+), 18 deletions(-)
diff --git a/arch/arm/mach-omap1/common.h b/arch/arm/mach-omap1/common.h
index c2552b2..f7b01f1 100644
--- a/arch/arm/mach-omap1/common.h
+++ b/arch/arm/mach-omap1/common.h@@ -90,4 +90,7 @@ extern int ocpi_enable(void); static inline int ocpi_enable(void) { return 0; } #endif +static inline void omap_reserve(void) +{ } + #endif /* __ARCH_ARM_MACH_OMAP1_COMMON_H */
diff --git a/arch/arm/mach-omap2/common.c b/arch/arm/mach-omap2/common.c
index 17950c6..4ce0d63 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 7045e4d..e84c589 100644
--- a/arch/arm/mach-omap2/common.h
+++ b/arch/arm/mach-omap2/common.h@@ -338,6 +338,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 18a837f..8cd5c46 100644
--- a/arch/arm/plat-omap/common.c
+++ b/arch/arm/plat-omap/common.c@@ -23,26 +23,9 @@ #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; -}
diff --git a/arch/arm/plat-omap/include/plat/common.h b/arch/arm/plat-omap/include/plat/common.h
index d1cb6f5..cb337c3 100644
--- a/arch/arm/plat-omap/include/plat/common.h
+++ b/arch/arm/plat-omap/include/plat/common.h@@ -34,7 +34,6 @@ extern int __init omap_init_clocksource_32k(void __iomem *vbase); extern void __init omap_check_revision(void); -extern void omap_reserve(void); extern int omap_dss_reset(struct omap_hwmod *); void omap_sram_init(void);
--
1.7.10.4