From patchwork Fri Aug 9 09:49:36 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 2841858 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id B4DFEBF546 for ; Fri, 9 Aug 2013 10:30:47 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 975F3202C6 for ; Fri, 9 Aug 2013 10:30:46 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 59AE8202F7 for ; Fri, 9 Aug 2013 10:30:45 +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 1V7jLM-0004H2-6Z; Fri, 09 Aug 2013 09:50:50 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1V7jKW-0008FL-S6; Fri, 09 Aug 2013 09:49:56 +0000 Received: from mail-pa0-x231.google.com ([2607:f8b0:400e:c03::231]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1V7jKN-0008B4-Hh for linux-arm-kernel@lists.infradead.org; Fri, 09 Aug 2013 09:49:48 +0000 Received: by mail-pa0-f49.google.com with SMTP id ld10so201895pab.8 for ; Fri, 09 Aug 2013 02:49:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:date:message-id:in-reply-to:references:subject; bh=rNFBAiEhowF0VPFy+02BvkAPpPJhoG0JM5RumPIEjvY=; b=p3TUsr2mSWmKLX6mjPYOjmuC6BzBz7ZfKNdeX8pAdEUfwrSUi+6afJk3WVqux1KfQj BH92ye4NsKKjN5aTtJNWeVAOlATt9mRq68BjTwQ6qy0ZfGySPSkuGwPpdwHp2yqWRQiL TTUzPDg0VwP2UDYVPEjeijDolL8jNXypQ45r5s+CXUcAPDsMmtDgl+i1cuJImw0UL5M3 kQItMx/x7ZyVNUMWjrDJnGPqzQZDOPP78lLdU1Y37+XXbQTsJbE+EuZF727JBbHm3n8b m0PeXmOCWCL4xfta7hKREJYk8gHt4buEURS1HDQUwErPBCaWRtU6YCTAVaO8t+UQBRgH Ef2A== X-Received: by 10.68.213.70 with SMTP id nq6mr10541155pbc.191.1376041766506; Fri, 09 Aug 2013 02:49:26 -0700 (PDT) Received: from [127.0.0.1] (ac230065.ppp.asahi-net.or.jp. [183.77.230.65]) by mx.google.com with ESMTPSA id ue9sm21590650pab.7.2013.08.09.02.49.22 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 09 Aug 2013 02:49:23 -0700 (PDT) From: Magnus Damm To: linux-sh@vger.kernel.org Date: Fri, 09 Aug 2013 18:49:36 +0900 Message-Id: <20130809094936.6530.31840.sendpatchset@w520> In-Reply-To: <20130809094748.6530.16511.sendpatchset@w520> References: <20130809094748.6530.16511.sendpatchset@w520> Subject: [PATCH 10/14] ARM: shmobile: Rename to emev2_init_early(), use smp_set_ops() X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130809_054947_723618_5BE67204 X-CRM114-Status: UNSURE ( 8.82 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.0 (--) Cc: olof@lixom.net, horms@verge.net.au, Magnus Damm , linux-arm-kernel@lists.infradead.org, arnd@arndb.de 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: , 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, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable 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: Magnus Damm Rename emev2_init_delay() into emev2_init_early() to make the function name show that more than just delay setup will happen. Also, instead of specifying the smp ops in DT_MACHINE convert the EMEV2 SoC code to install the smp ops from emev2_init_early(). Signed-off-by: Magnus Damm --- arch/arm/mach-shmobile/board-kzm9d-reference.c | 3 +-- arch/arm/mach-shmobile/board-kzm9d.c | 3 +-- arch/arm/mach-shmobile/include/mach/emev2.h | 2 +- arch/arm/mach-shmobile/setup-emev2.c | 8 +++++--- 4 files changed, 8 insertions(+), 8 deletions(-) --- 0001/arch/arm/mach-shmobile/board-kzm9d-reference.c +++ work/arch/arm/mach-shmobile/board-kzm9d-reference.c 2013-08-08 16:18:34.000000000 +0900 @@ -38,9 +38,8 @@ static const char *kzm9d_boards_compat_d }; DT_MACHINE_START(KZM9D_DT, "kzm9d") - .smp = smp_ops(emev2_smp_ops), .map_io = emev2_map_io, - .init_early = emev2_init_delay, + .init_early = emev2_init_early, .init_machine = kzm9d_add_standard_devices, .init_late = shmobile_init_late, .dt_compat = kzm9d_boards_compat_dt, --- 0001/arch/arm/mach-shmobile/board-kzm9d.c +++ work/arch/arm/mach-shmobile/board-kzm9d.c 2013-08-08 16:18:17.000000000 +0900 @@ -83,9 +83,8 @@ static const char *kzm9d_boards_compat_d }; DT_MACHINE_START(KZM9D_DT, "kzm9d") - .smp = smp_ops(emev2_smp_ops), .map_io = emev2_map_io, - .init_early = emev2_init_delay, + .init_early = emev2_init_early, .init_machine = kzm9d_add_standard_devices, .init_late = shmobile_init_late, .dt_compat = kzm9d_boards_compat_dt, --- 0001/arch/arm/mach-shmobile/include/mach/emev2.h +++ work/arch/arm/mach-shmobile/include/mach/emev2.h 2013-08-08 16:17:57.000000000 +0900 @@ -2,7 +2,7 @@ #define __ASM_EMEV2_H__ extern void emev2_map_io(void); -extern void emev2_init_delay(void); +extern void emev2_init_early(void); extern void emev2_add_standard_devices(void); extern void emev2_clock_init(void); --- 0001/arch/arm/mach-shmobile/setup-emev2.c +++ work/arch/arm/mach-shmobile/setup-emev2.c 2013-08-08 16:17:47.000000000 +0900 @@ -190,9 +190,12 @@ void __init emev2_add_standard_devices(v emev2_register_pmu(); } -void __init emev2_init_delay(void) +void __init emev2_init_early(void) { shmobile_setup_delay(533, 1, 3); /* Cortex-A9 @ 533MHz */ +#ifdef CONFIG_SMP + smp_set_ops(&emev2_smp_ops); +#endif } #ifdef CONFIG_USE_OF @@ -203,9 +206,8 @@ static const char *emev2_boards_compat_d }; DT_MACHINE_START(EMEV2_DT, "Generic Emma Mobile EV2 (Flattened Device Tree)") - .smp = smp_ops(emev2_smp_ops), .map_io = emev2_map_io, - .init_early = emev2_init_delay, + .init_early = emev2_init_early, .dt_compat = emev2_boards_compat_dt, MACHINE_END