From 138823ab71280d52ee33ca83d4d0e78bec06ebeb Mon Sep 17 00:00:00 2001
From: Lokesh Vutla <lokeshvutla@ti.com>
Date: Tue, 2 Oct 2012 00:17:05 +0530
Subject: [PATCH] --- yaml --- r: 339656 b: refs/heads/master c:
 f583f0f2c720e4ac7d2ffd65996717bf0345a3e5 h: refs/heads/master v: v3

---
 [refs]                             |  2 +-
 trunk/arch/arm/mach-omap2/common.c | 20 ++++++++++++++++++++
 trunk/arch/arm/mach-omap2/common.h |  1 +
 trunk/arch/arm/plat-omap/common.c  | 21 ---------------------
 4 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/[refs] b/[refs]
index ff5dcaf0e357..a3afdebfd128 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f300af86a85c69fb1552b5389f968ea1a3e0a3eb
+refs/heads/master: f583f0f2c720e4ac7d2ffd65996717bf0345a3e5
diff --git a/trunk/arch/arm/mach-omap2/common.c b/trunk/arch/arm/mach-omap2/common.c
index 17950c6e130b..4ce0d63e941b 100644
--- a/trunk/arch/arm/mach-omap2/common.c
+++ b/trunk/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/trunk/arch/arm/mach-omap2/common.h b/trunk/arch/arm/mach-omap2/common.h
index b91b2a2308aa..42b1b2e009d3 100644
--- a/trunk/arch/arm/mach-omap2/common.h
+++ b/trunk/arch/arm/mach-omap2/common.h
@@ -343,6 +343,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/trunk/arch/arm/plat-omap/common.c b/trunk/arch/arm/plat-omap/common.c
index 2a9db0128a96..a1555e028123 100644
--- a/trunk/arch/arm/plat-omap/common.c
+++ b/trunk/arch/arm/plat-omap/common.c
@@ -17,32 +17,11 @@
 #include <linux/dma-mapping.h>
 
 #include "common.h"
-#include <plat/vram.h>
-#include <linux/platform_data/dsp-omap.h>
 #include <plat-omap/dma-omap.h>
 
-#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;
-}