From patchwork Wed Jun 3 02:14:01 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dinh Nguyen X-Patchwork-Id: 6531881 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 694579F3D1 for ; Wed, 3 Jun 2015 02:17:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8BA1020694 for ; Wed, 3 Jun 2015 02:17:01 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B4A592068A for ; Wed, 3 Jun 2015 02:17:00 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YzyCz-0003QO-MZ; Wed, 03 Jun 2015 02:15:09 +0000 Received: from mail-pd0-x234.google.com ([2607:f8b0:400e:c02::234]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YzyCQ-0002Vw-RQ for linux-arm-kernel@lists.infradead.org; Wed, 03 Jun 2015 02:14:35 +0000 Received: by pdbnf5 with SMTP id nf5so84624176pdb.2 for ; Tue, 02 Jun 2015 19:14:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=qTkfMnK4o5mDD2X5b1XiAFJEEV4Df46+8S2flUHM6Ag=; b=sN4djZdxgSEAcFHJuayWdEEtYMmeBdO1xWcytWLwWCvAVFNyKF/CXJ8Iw5rw1/OaLR f7Os2uW8gutQdDO7TMO6IJTj8pLVlBrF9IJXktU+e+EU0ixWjx+FPHDSg7uweC8yZ1+5 NOhA2X/SL2MFVBrPpIlGhaaO7xp2YdzDlrJLwU18CEaNRgIHSq23jK3lvOa1/TZ6XjfJ mXwr+QOajAFMnW0HYOwUDQAiTiN41pTCMnXnCrEK8IDwTi1v4hORgubp9RBKxX4MFR1f WVpvGVUjzKv/suRbI2U8Zbn31XKNG98eNAiwSJ8E+sa2nyH5L1CeyuU04rllp9rEr37m dfBA== X-Received: by 10.68.94.129 with SMTP id dc1mr17740631pbb.8.1433297653462; Tue, 02 Jun 2015 19:14:13 -0700 (PDT) Received: from localhost.localdomain (99-103-66-154.lightspeed.austtx.sbcglobal.net. [99.103.66.154]) by mx.google.com with ESMTPSA id zt9sm19187296pac.9.2015.06.02.19.14.11 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 02 Jun 2015 19:14:12 -0700 (PDT) From: dinh.linux@gmail.com To: arm@kernel.org Subject: [PATCH 1/2] ARM: socfpga: use CPU_METHOD_OF_DECLARE for socfpga_cyclone5 Date: Tue, 2 Jun 2015 21:14:01 -0500 Message-Id: <1433297642-3818-2-git-send-email-dinh.linux@gmail.com> X-Mailer: git-send-email 1.9.1.315.g3f09db0 In-Reply-To: <1433297642-3818-1-git-send-email-dinh.linux@gmail.com> References: <1433297642-3818-1-git-send-email-dinh.linux@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150602_191434_963292_3195F221 X-CRM114-Status: GOOD ( 11.26 ) X-Spam-Score: -0.8 (/) Cc: dinguyen@opensource.altera.com, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Dinh Nguyen Convert cyclone5/arria5 to use CPU_METHOD_OF_DECLARE for smp operations. Signed-off-by: Dinh Nguyen --- arch/arm/mach-socfpga/core.h | 1 - arch/arm/mach-socfpga/platsmp.c | 4 +++- arch/arm/mach-socfpga/socfpga.c | 1 - 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-socfpga/core.h b/arch/arm/mach-socfpga/core.h index 5913bbb..38e5cbf 100644 --- a/arch/arm/mach-socfpga/core.h +++ b/arch/arm/mach-socfpga/core.h @@ -39,7 +39,6 @@ extern void socfpga_sysmgr_init(void); extern void __iomem *sys_manager_base_addr; extern void __iomem *rst_manager_base_addr; -extern struct smp_operations socfpga_smp_ops; extern char secondary_trampoline, secondary_trampoline_end; extern unsigned long socfpga_cpu1start_addr; diff --git a/arch/arm/mach-socfpga/platsmp.c b/arch/arm/mach-socfpga/platsmp.c index 7886eae..b84c1a1 100644 --- a/arch/arm/mach-socfpga/platsmp.c +++ b/arch/arm/mach-socfpga/platsmp.c @@ -83,10 +83,12 @@ static void socfpga_cpu_die(unsigned int cpu) cpu_do_idle(); } -struct smp_operations socfpga_smp_ops __initdata = { +static struct smp_operations socfpga_smp_ops __initdata = { .smp_prepare_cpus = socfpga_smp_prepare_cpus, .smp_boot_secondary = socfpga_boot_secondary, #ifdef CONFIG_HOTPLUG_CPU .cpu_die = socfpga_cpu_die, #endif }; + +CPU_METHOD_OF_DECLARE(socfpga_smp, "altr,socfpga-smp", &socfpga_smp_ops); diff --git a/arch/arm/mach-socfpga/socfpga.c b/arch/arm/mach-socfpga/socfpga.c index b63dec6..a154920 100644 --- a/arch/arm/mach-socfpga/socfpga.c +++ b/arch/arm/mach-socfpga/socfpga.c @@ -78,7 +78,6 @@ static const char *altera_dt_match[] = { DT_MACHINE_START(SOCFPGA, "Altera SOCFPGA") .l2c_aux_val = 0, .l2c_aux_mask = ~0, - .smp = smp_ops(socfpga_smp_ops), .init_irq = socfpga_init_irq, .restart = socfpga_cyclone5_restart, .dt_compat = altera_dt_match,