From patchwork Fri Sep 28 13:40:08 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lokesh Vutla X-Patchwork-Id: 1519581 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 1CC13DF283 for ; Fri, 28 Sep 2012 13:40:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757026Ab2I1NkZ (ORCPT ); Fri, 28 Sep 2012 09:40:25 -0400 Received: from devils.ext.ti.com ([198.47.26.153]:38157 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757898Ab2I1NkX (ORCPT ); Fri, 28 Sep 2012 09:40:23 -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 q8SDeGoo012150; Fri, 28 Sep 2012 08:40:17 -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 q8SDeEIe025215; Fri, 28 Sep 2012 19:10:15 +0530 (IST) Received: from dbdp33.itg.ti.com (172.24.170.252) by dbde70.ent.ti.com (172.24.170.148) with Microsoft SMTP Server id 14.1.323.3; Fri, 28 Sep 2012 19:10:14 +0530 Received: from a0131933lt.apr.dhcp.ti.com (smtpvbd.itg.ti.com [172.24.170.250]) by dbdp33.itg.ti.com (8.13.8/8.13.8) with ESMTP id q8SDeB30022057; Fri, 28 Sep 2012 19:10:14 +0530 From: Lokesh Vutla To: CC: , , , Subject: [PATCH 3/4] ARM: OMAP: Move omap_reserve() locally to mach-omap1/2 Date: Fri, 28 Sep 2012 19:10:08 +0530 Message-ID: <1348839609-10456-4-git-send-email-lokeshvutla@ti.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1348839609-10456-1-git-send-email-lokeshvutla@ti.com> References: <1348839609-10456-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 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 Acked-by : Santosh Shilimkar --- 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 #include #include +#include #include +#include +#include #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 -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);