From patchwork Thu Apr 3 08:08:14 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Antoine Tenart X-Patchwork-Id: 3931841 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.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B361A9F2F7 for ; Thu, 3 Apr 2014 08:11:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AAEF9202FE for ; Thu, 3 Apr 2014 08:10:59 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (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 BAE42200CA for ; Thu, 3 Apr 2014 08:10:58 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WVciH-00052h-H7; Thu, 03 Apr 2014 08:09:30 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WVci1-0003tq-4L; Thu, 03 Apr 2014 08:09:13 +0000 Received: from top.free-electrons.com ([176.31.233.9] helo=mail.free-electrons.com) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WVchb-0003p5-Cj for linux-arm-kernel@lists.infradead.org; Thu, 03 Apr 2014 08:08:49 +0000 Received: by mail.free-electrons.com (Postfix, from userid 106) id 8892C912; Thu, 3 Apr 2014 10:08:19 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-4.8 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from localhost.localdomain (col31-4-88-188-83-94.fbx.proxad.net [88.188.83.94]) by mail.free-electrons.com (Postfix) with ESMTPSA id 00EFF7E9; Thu, 3 Apr 2014 10:08:18 +0200 (CEST) From: =?UTF-8?q?Antoine=20T=C3=A9nart?= To: sebastian.hesselbarth@gmail.com Subject: [PATCH 1/3] ARM: berlin: use CPU_METHOD_OF_DECLARE for smp Date: Thu, 3 Apr 2014 10:08:14 +0200 Message-Id: <1396512496-8030-2-git-send-email-antoine.tenart@free-electrons.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1396512496-8030-1-git-send-email-antoine.tenart@free-electrons.com> References: <1396512496-8030-1-git-send-email-antoine.tenart@free-electrons.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140403_040847_622170_897E7FBB X-CRM114-Status: GOOD ( 12.30 ) X-Spam-Score: -1.8 (-) Cc: zmxu@marvell.com, jszhang@marvell.com, devicetree@vger.kernel.org, =?UTF-8?q?Antoine=20T=C3=A9nart?= , linux-kernel@vger.kernel.org, alexandre.belloni@free-electrons.com, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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 Get rid of the smp ops in the machine descriptor and select the cpu enable method in the device tree. Signed-off-by: Antoine Ténart --- arch/arm/mach-berlin/berlin.c | 1 - arch/arm/mach-berlin/common.h | 2 -- arch/arm/mach-berlin/platsmp.c | 3 ++- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-berlin/berlin.c b/arch/arm/mach-berlin/berlin.c index 1bbca793174d..3cc3e706719e 100644 --- a/arch/arm/mach-berlin/berlin.c +++ b/arch/arm/mach-berlin/berlin.c @@ -38,5 +38,4 @@ static const char * const berlin_dt_compat[] = { DT_MACHINE_START(BERLIN_DT, "Marvell Berlin") .dt_compat = berlin_dt_compat, .init_machine = berlin_init_machine, - .smp = smp_ops(berlin_smp_ops), MACHINE_END diff --git a/arch/arm/mach-berlin/common.h b/arch/arm/mach-berlin/common.h index 57c97669af0a..8d585e2481f9 100644 --- a/arch/arm/mach-berlin/common.h +++ b/arch/arm/mach-berlin/common.h @@ -13,6 +13,4 @@ extern void berlin_secondary_startup(void); -extern struct smp_operations berlin_smp_ops; - #endif diff --git a/arch/arm/mach-berlin/platsmp.c b/arch/arm/mach-berlin/platsmp.c index 5c83941b0918..86fe697577fd 100644 --- a/arch/arm/mach-berlin/platsmp.c +++ b/arch/arm/mach-berlin/platsmp.c @@ -132,8 +132,9 @@ static void __init berlin_smp_prepare_cpus(unsigned int max_cpus) iounmap(gpr_base); } -struct smp_operations berlin_smp_ops __initdata = { +static struct smp_operations berlin_smp_ops __initdata = { .smp_prepare_cpus = berlin_smp_prepare_cpus, .smp_secondary_init = berlin_secondary_init, .smp_boot_secondary = berlin_boot_secondary, }; +CPU_METHOD_OF_DECLARE(berlin_smp, "marvell,88de31-smp", &berlin_smp_ops);