From patchwork Mon Oct 1 18:47:06 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lokesh Vutla X-Patchwork-Id: 1532231 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 9E4A23FE80 for ; Mon, 1 Oct 2012 18:47:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751191Ab2JASr5 (ORCPT ); Mon, 1 Oct 2012 14:47:57 -0400 Received: from devils.ext.ti.com ([198.47.26.153]:37046 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751493Ab2JASrq (ORCPT ); Mon, 1 Oct 2012 14:47:46 -0400 Received: from dbdp20.itg.ti.com ([172.24.170.38]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id q91Ilg8K011579; Mon, 1 Oct 2012 13:47:43 -0500 Received: from DBDE70.ent.ti.com (localhost [127.0.0.1]) by dbdp20.itg.ti.com (8.13.8/8.13.8) with ESMTP id q91IlglR000868; Tue, 2 Oct 2012 00:17:42 +0530 (IST) Received: from dbdp32.itg.ti.com (172.24.170.251) by dbde70.ent.ti.com (172.24.170.148) with Microsoft SMTP Server id 14.1.323.3; Tue, 2 Oct 2012 00:17:41 +0530 Received: from a0131933lt.itg.ti.com (smtpvbd.itg.ti.com [172.24.170.250]) by dbdp32.itg.ti.com (8.13.8/8.13.8) with ESMTP id q91Il8QO025005; Tue, 2 Oct 2012 00:17:38 +0530 From: Lokesh Vutla To: CC: , , , Subject: [PATCH V2 7/7] ARM: OMAP: Move plat/omap-secure.h locally to mach-omap2 Date: Tue, 2 Oct 2012 00:17:06 +0530 Message-ID: <1349117226-4980-8-git-send-email-lokeshvutla@ti.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1349117226-4980-1-git-send-email-lokeshvutla@ti.com> References: <1349117226-4980-1-git-send-email-lokeshvutla@ti.com> MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org Moving plat/omap-secure.h locally to mach-omap2/ as part of single zImage work Signed-off-by: Lokesh Vutla --- 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/include/plat/omap-secure.h | 14 -------------- 5 files changed, 9 insertions(+), 17 deletions(-) delete mode 100644 arch/arm/plat-omap/include/plat/omap-secure.h 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 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 #include -#include #include #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 #include -#include #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 #include -#include #include #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;