From: Lokesh Vutla <lokeshvutla@ti.com>
To: tony@atomide.com
Cc: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
santosh.shilimkar@ti.com, lokeshvutla@ti.com
Subject: [PATCH 4/4] ARM: OMAP: Move plat/omap-secure.h locally to mach-omap2
Date: Fri, 28 Sep 2012 19:10:09 +0530 [thread overview]
Message-ID: <1348839609-10456-5-git-send-email-lokeshvutla@ti.com> (raw)
In-Reply-To: <1348839609-10456-1-git-send-email-lokeshvutla@ti.com>
Moving plat/omap-secure.h locally to mach-oamp2/
as part of single zImage work
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Acked-by : Santosh Shilimkar <santosh.shilimkar@ti.com>
---
arch/arm/mach-omap2/common.c | 2 +-
arch/arm/mach-omap2/omap-secure.c | 1 -
arch/arm/mach-omap2/omap-secure.h | 7 +++++++
arch/arm/mach-omap2/omap4-common.c | 2 +-
arch/arm/plat-omap/common.c | 2 --
arch/arm/plat-omap/include/plat/omap-secure.h | 14 --------------
6 files changed, 9 insertions(+), 19 deletions(-)
delete mode 100644 arch/arm/plat-omap/include/plat/omap-secure.h
diff --git a/arch/arm/mach-omap2/common.c b/arch/arm/mach-omap2/common.c
index 4ce0d63..b0f21b7 100644
--- a/arch/arm/mach-omap2/common.c
+++ b/arch/arm/mach-omap2/common.c
@@ -19,7 +19,6 @@
#include <linux/platform_data/dsp-omap.h>
#include <plat/clock.h>
-#include <plat/omap-secure.h>
#include <plat/vram.h>
#include "soc.h"
@@ -27,6 +26,7 @@
#include "common.h"
#include "sdrc.h"
#include "control.h"
+#include "omap-secure.h"
/* Global address base setup code */
diff --git a/arch/arm/mach-omap2/omap-secure.c b/arch/arm/mach-omap2/omap-secure.c
index a004cb9..98624fe 100644
--- a/arch/arm/mach-omap2/omap-secure.c
+++ b/arch/arm/mach-omap2/omap-secure.c
@@ -18,7 +18,6 @@
#include <asm/cacheflush.h>
#include <asm/memblock.h>
-#include <plat/omap-secure.h>
#include "omap-secure.h"
static phys_addr_t omap_secure_memblock_base;
diff --git a/arch/arm/mach-omap2/omap-secure.h b/arch/arm/mach-omap2/omap-secure.h
index c90a435..0e72917 100644
--- a/arch/arm/mach-omap2/omap-secure.h
+++ b/arch/arm/mach-omap2/omap-secure.h
@@ -52,6 +52,13 @@ extern u32 omap_secure_dispatcher(u32 idx, u32 flag, u32 nargs,
u32 arg1, u32 arg2, u32 arg3, u32 arg4);
extern u32 omap_smc2(u32 id, u32 falg, u32 pargs);
extern phys_addr_t omap_secure_ram_mempool_base(void);
+extern int omap_secure_ram_reserve_memblock(void);
+#ifdef CONFIG_OMAP4_ERRATA_I688
+extern int omap_barrier_reserve_memblock(void);
+#else
+static inline void omap_barrier_reserve_memblock(void)
+{ }
+#endif
#endif /* __ASSEMBLER__ */
#endif /* OMAP_ARCH_OMAP_SECURE_H */
diff --git a/arch/arm/mach-omap2/omap4-common.c b/arch/arm/mach-omap2/omap4-common.c
index e1f2897..ae57b63 100644
--- a/arch/arm/mach-omap2/omap4-common.c
+++ b/arch/arm/mach-omap2/omap4-common.c
@@ -26,7 +26,6 @@
#include <asm/memblock.h>
#include <plat/sram.h>
-#include <plat/omap-secure.h>
#include <plat/mmc.h>
#include "omap-wakeupgen.h"
@@ -35,6 +34,7 @@
#include "common.h"
#include "hsmmc.h"
#include "omap4-sar-layout.h"
+#include "omap-secure.h"
#ifdef CONFIG_CACHE_L2X0
static void __iomem *l2cache_base;
diff --git a/arch/arm/plat-omap/common.c b/arch/arm/plat-omap/common.c
index 8cd5c46..6fdb8ff 100644
--- a/arch/arm/plat-omap/common.c
+++ b/arch/arm/plat-omap/common.c
@@ -21,8 +21,6 @@
#include <plat/vram.h>
#include <linux/platform_data/dsp-omap.h>
-#include <plat/omap-secure.h>
-
void __init omap_init_consistent_dma_size(void)
{
#ifdef CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE
diff --git a/arch/arm/plat-omap/include/plat/omap-secure.h b/arch/arm/plat-omap/include/plat/omap-secure.h
deleted file mode 100644
index 0e4acd2..0000000
--
1.7.10.4
prev parent reply other threads:[~2012-09-28 13:40 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-28 13:40 [PATCH 0/4] ARM: OMAP: Move plat/dma*.h,omap-secure.h headers as part of single zImage work Lokesh Vutla
2012-09-28 13:40 ` [PATCH 1/4] ARM: OMAP: DMA: Removing plat/dma-44xx.h Lokesh Vutla
2012-09-28 13:40 ` [PATCH 2/4] ARM: OMAP: DMA: Move plat/dma hearder to platform_data/dma-omap Lokesh Vutla
2012-09-28 14:55 ` Tony Lindgren
2012-09-28 15:01 ` Shilimkar, Santosh
2012-09-28 15:05 ` Tony Lindgren
2012-09-28 15:11 ` Shilimkar, Santosh
2012-09-28 15:54 ` Russell King - ARM Linux
2012-09-28 19:35 ` Jon Hunter
2012-09-29 16:57 ` Tony Lindgren
2012-10-01 8:51 ` Vutla, Lokesh
2012-09-28 13:40 ` [PATCH 3/4] ARM: OMAP: Move omap_reserve() locally to mach-omap1/2 Lokesh Vutla
2012-09-29 19:39 ` Russell King - ARM Linux
2012-09-30 8:20 ` Shilimkar, Santosh
2012-09-30 18:05 ` Tony Lindgren
2012-10-01 5:01 ` Vutla, Lokesh
2012-09-28 13:40 ` Lokesh Vutla [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1348839609-10456-5-git-send-email-lokeshvutla@ti.com \
--to=lokeshvutla@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
--cc=santosh.shilimkar@ti.com \
--cc=tony@atomide.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox