From patchwork Tue Feb 12 16:28:52 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 219896 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 7FCF22C0080 for ; Wed, 13 Feb 2013 03:29:51 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933352Ab3BLQ3l (ORCPT ); Tue, 12 Feb 2013 11:29:41 -0500 Received: from mail.free-electrons.com ([94.23.35.102]:45894 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933365Ab3BLQ3j (ORCPT ); Tue, 12 Feb 2013 11:29:39 -0500 Received: by mail.free-electrons.com (Postfix, from userid 106) id DB166B9A; Tue, 12 Feb 2013 17:29:38 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on mail.free-electrons.com X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,SHORTCIRCUIT shortcircuit=ham autolearn=disabled version=3.3.2 Received: from localhost (col31-4-88-188-83-94.fbx.proxad.net [88.188.83.94]) by mail.free-electrons.com (Postfix) with ESMTPSA id 50788825; Tue, 12 Feb 2013 17:29:38 +0100 (CET) From: Thomas Petazzoni To: Bjorn Helgaas , linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Lior Amsalem , Andrew Lunn , Russell King - ARM Linux , Jason Cooper , Arnd Bergmann , Stephen Warren , Thierry Reding , Eran Ben-Avi , Nadav Haklai , Maen Suleiman , Shadi Ammouri , Gregory Clement , Jason Gunthorpe , Tawfik Bayouk Subject: [PATCH 18/32] arm: plat-orion: remove __init from addr-map functions needed after boot time Date: Tue, 12 Feb 2013 17:28:52 +0100 Message-Id: <1360686546-24277-19-git-send-email-thomas.petazzoni@free-electrons.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1360686546-24277-1-git-send-email-thomas.petazzoni@free-electrons.com> References: <1360686546-24277-1-git-send-email-thomas.petazzoni@free-electrons.com> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org The I/O and memory windows of PCIe interfaces will now be configurable dynamically, while the system runs, so we need to keep some the plat-orion/addr-map.c functions around even after the system initialization has completed. Signed-off-by: Thomas Petazzoni --- arch/arm/plat-orion/addr-map.c | 18 +++++++++--------- arch/arm/plat-orion/include/plat/addr-map.h | 8 ++++---- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/arch/arm/plat-orion/addr-map.c b/arch/arm/plat-orion/addr-map.c index b1d4806..a187524 100644 --- a/arch/arm/plat-orion/addr-map.c +++ b/arch/arm/plat-orion/addr-map.c @@ -48,7 +48,7 @@ EXPORT_SYMBOL_GPL(mv_mbus_dram_info); /* * Default implementation */ -static void __init __iomem * +static void __iomem * orion_win_cfg_base(const struct orion_addr_map_cfg *cfg, int win) { return cfg->bridge_virt_base + (win << 4); @@ -57,8 +57,8 @@ orion_win_cfg_base(const struct orion_addr_map_cfg *cfg, int win) /* * Default implementation */ -static int __init orion_cpu_win_can_remap(const struct orion_addr_map_cfg *cfg, - const int win) +static int orion_cpu_win_can_remap(const struct orion_addr_map_cfg *cfg, + const int win) { if (win < cfg->remappable_wins) return 1; @@ -66,10 +66,10 @@ static int __init orion_cpu_win_can_remap(const struct orion_addr_map_cfg *cfg, return 0; } -void __init orion_setup_cpu_win(const struct orion_addr_map_cfg *cfg, - const int win, const u32 base, - const u32 size, const u8 target, - const u8 attr, const u32 remap) +void orion_setup_cpu_win(const struct orion_addr_map_cfg *cfg, + const int win, const u32 base, + const u32 size, const u8 target, + const u8 attr, const u32 remap) { void __iomem *addr = cfg->win_cfg_base(cfg, win); u32 ctrl, base_high, remap_addr; @@ -95,8 +95,8 @@ void __init orion_setup_cpu_win(const struct orion_addr_map_cfg *cfg, } } -static void __init orion_disable_cpu_win(const struct orion_addr_map_cfg *cfg, - const int win) +static void orion_disable_cpu_win(const struct orion_addr_map_cfg *cfg, + const int win) { void __iomem *addr = cfg->win_cfg_base(cfg, win); diff --git a/arch/arm/plat-orion/include/plat/addr-map.h b/arch/arm/plat-orion/include/plat/addr-map.h index 6533c47..a5b21a9 100644 --- a/arch/arm/plat-orion/include/plat/addr-map.h +++ b/arch/arm/plat-orion/include/plat/addr-map.h @@ -46,10 +46,10 @@ struct orion_addr_map_info { void __init orion_config_wins(struct orion_addr_map_cfg *cfg, const struct orion_addr_map_info *info); -void __init orion_setup_cpu_win(const struct orion_addr_map_cfg *cfg, - const int win, const u32 base, - const u32 size, const u8 target, - const u8 attr, const u32 remap); +void orion_setup_cpu_win(const struct orion_addr_map_cfg *cfg, + const int win, const u32 base, + const u32 size, const u8 target, + const u8 attr, const u32 remap); void __init orion_setup_cpu_mbus_target(const struct orion_addr_map_cfg *cfg, const void __iomem *ddr_window_cpu_base);