diff options
author | Lokesh Vutla <lokeshvutla@ti.com> | 2012-10-02 00:17:06 +0530 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2012-10-18 16:22:24 -0700 |
commit | f7a9b8a147cc10c7181cf0ca7b2b06cebf950140 (patch) | |
tree | f8614abe2b635181146aafae9f15a58fae1e3e83 | |
parent | f583f0f2c720e4ac7d2ffd65996717bf0345a3e5 (diff) | |
download | linux-3.10-f7a9b8a147cc10c7181cf0ca7b2b06cebf950140.tar.gz linux-3.10-f7a9b8a147cc10c7181cf0ca7b2b06cebf950140.tar.bz2 linux-3.10-f7a9b8a147cc10c7181cf0ca7b2b06cebf950140.zip |
ARM: OMAP: Move plat/omap-secure.h locally to mach-omap2
Moving plat/omap-secure.h locally to mach-omap2/
as part of single zImage work
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
-rw-r--r-- | arch/arm/mach-omap2/common.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-omap2/omap-secure.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-omap2/omap-secure.h | 7 | ||||
-rw-r--r-- | arch/arm/mach-omap2/omap4-common.c | 3 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/plat/omap-secure.h | 14 |
5 files changed, 9 insertions, 18 deletions
diff --git a/arch/arm/mach-omap2/common.c b/arch/arm/mach-omap2/common.c index 4ce0d63e941..b0f21b7d376 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 e089e4d1ae3..b970440cffc 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 c90a43589ab..0e729170c46 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 05d55fb3f8f..d25845c471d 100644 --- a/arch/arm/mach-omap2/omap4-common.c +++ b/arch/arm/mach-omap2/omap4-common.c @@ -25,8 +25,6 @@ #include <asm/mach/map.h> #include <asm/memblock.h> -#include <plat/omap-secure.h> - #include "../plat-omap/sram.h" #include "omap-wakeupgen.h" @@ -35,6 +33,7 @@ #include "mmc.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/include/plat/omap-secure.h b/arch/arm/plat-omap/include/plat/omap-secure.h deleted file mode 100644 index 0e4acd2d2de..00000000000 --- a/arch/arm/plat-omap/include/plat/omap-secure.h +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef __OMAP_SECURE_H__ -#define __OMAP_SECURE_H__ - -#include <linux/types.h> - -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 /* __OMAP_SECURE_H__ */ |