From patchwork Tue Apr 3 06:18:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Myl=C3=A8ne_Josserand?= X-Patchwork-Id: 10320647 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 443D260116 for ; Tue, 3 Apr 2018 06:28:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 32E13287C0 for ; Tue, 3 Apr 2018 06:28:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 254AA28984; Tue, 3 Apr 2018 06:28:41 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 1423D287C0 for ; Tue, 3 Apr 2018 06:28:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=MLqj1HOvEeLbjewCYAPzBk847hQTtHj991K7aCGFVrQ=; b=Ea4neb721hFe6j FOReuCxYpSXQiq5WKPt6SRSYTa7VeL23g4xVb+st/kG9BgUzqYtocXtNjShxnxLaWN1u33TWOHl5T rba/ZqlRR2blq9cRxttBCugl6WHjEfrfpGEqJwsMr2mD5EltDvk1TeVfbSQnasfJqGmbEq/WyH/Xu yjsIta1aPhgtVCeWh5rFzgFCtKEk8KehSLeFSQjgcrZ4E2JDJv4Cb7z96vVNDIlX5IwHFhe3yOdAY 2jRAUDdGGUny65eREkCPn0OJqKXF090Yka9djK+fTiH/3ALzXYnnTNBsLlIgSHets1G7Ed8/yqkOj 04HCzKS8Y2wVCmWYsKMA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1f3FQh-0002eF-0L; Tue, 03 Apr 2018 06:28:27 +0000 Received: from mail.bootlin.com ([62.4.15.54]) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1f3FJm-0005U3-1J for linux-arm-kernel@lists.infradead.org; Tue, 03 Apr 2018 06:21:23 +0000 Received: by mail.bootlin.com (Postfix, from userid 110) id 08EF4207E9; Tue, 3 Apr 2018 08:21:05 +0200 (CEST) Received: from dell-desktop.home (LStLambert-657-1-97-87.w90-63.abo.wanadoo.fr [90.63.216.87]) by mail.bootlin.com (Postfix) with ESMTPSA id AFE7320898; Tue, 3 Apr 2018 08:21:04 +0200 (CEST) From: =?UTF-8?q?Myl=C3=A8ne=20Josserand?= To: linux@armlinux.org.uk, maxime.ripard@bootlin.com, wens@csie.org, marc.zyngier@arm.com, mark.rutland@arm.com, robh+dt@kernel.org Subject: [PATCH v5 10/13] ARM: sun9i: smp: Move structures Date: Tue, 3 Apr 2018 08:18:33 +0200 Message-Id: <20180403061836.3926-11-mylene.josserand@bootlin.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180403061836.3926-1-mylene.josserand@bootlin.com> References: <20180403061836.3926-1-mylene.josserand@bootlin.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180402_232118_486055_6DE1CCC0 X-CRM114-Status: GOOD ( 14.84 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, quentin.schulz@bootlin.com, linux-kernel@vger.kernel.org, clabbe.montjoie@gmail.com, thomas.petazzoni@bootlin.com, mylene.josserand@bootlin.com, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP To prepare the support for sun8i-a83t, move some structures at the beginning of the file. Signed-off-by: Mylène Josserand --- arch/arm/mach-sunxi/mc_smp.c | 48 +++++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/arch/arm/mach-sunxi/mc_smp.c b/arch/arm/mach-sunxi/mc_smp.c index 03f021d0c73e..0a7252df207f 100644 --- a/arch/arm/mach-sunxi/mc_smp.c +++ b/arch/arm/mach-sunxi/mc_smp.c @@ -72,9 +72,34 @@ static void __iomem *cpucfg_base; static void __iomem *prcm_base; static void __iomem *sram_b_smp_base; +/* + * This holds any device nodes that we requested resources for, + * so that we may easily release resources in the error path. + */ +struct sunxi_mc_smp_nodes { + struct device_node *prcm_node; + struct device_node *cpucfg_node; + struct device_node *sram_node; +}; + +/* This structure holds SoC-specific bits tied to an enable-method string. */ +struct sunxi_mc_smp_data { + const char *enable_method; + int (*get_smp_nodes)(struct sunxi_mc_smp_nodes *nodes); +}; + extern void sunxi_mc_smp_secondary_startup(void); extern void sunxi_mc_smp_resume(void); +static int __init sun9i_a80_get_smp_nodes(struct sunxi_mc_smp_nodes *nodes); + +static const struct sunxi_mc_smp_data sunxi_mc_smp_data[] __initconst = { + { + .enable_method = "allwinner,sun9i-a80-smp", + .get_smp_nodes = sun9i_a80_get_smp_nodes, + }, +}; + static bool sunxi_core_is_cortex_a15(unsigned int core, unsigned int cluster) { struct device_node *node; @@ -610,22 +635,6 @@ static int __init sunxi_mc_smp_loopback(void) return ret; } -/* - * This holds any device nodes that we requested resources for, - * so that we may easily release resources in the error path. - */ -struct sunxi_mc_smp_nodes { - struct device_node *prcm_node; - struct device_node *cpucfg_node; - struct device_node *sram_node; -}; - -/* This structure holds SoC-specific bits tied to an enable-method string. */ -struct sunxi_mc_smp_data { - const char *enable_method; - int (*get_smp_nodes)(struct sunxi_mc_smp_nodes *nodes); -}; - static void __init sunxi_mc_smp_put_nodes(struct sunxi_mc_smp_nodes *nodes) { of_node_put(nodes->prcm_node); @@ -660,13 +669,6 @@ static int __init sun9i_a80_get_smp_nodes(struct sunxi_mc_smp_nodes *nodes) return 0; } -static const struct sunxi_mc_smp_data sunxi_mc_smp_data[] __initconst = { - { - .enable_method = "allwinner,sun9i-a80-smp", - .get_smp_nodes = sun9i_a80_get_smp_nodes, - }, -}; - static int __init sunxi_mc_smp_init(void) { struct sunxi_mc_smp_nodes nodes = { 0 };