From patchwork Wed Jul 24 07:27:39 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 2832576 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 25A089F243 for ; Wed, 24 Jul 2013 07:28:05 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 06BA620256 for ; Wed, 24 Jul 2013 07:28:04 +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 0A84B20255 for ; Wed, 24 Jul 2013 07:28:03 +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 1V1tUO-0005VX-LB; Wed, 24 Jul 2013 07:28:00 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1V1tUM-0003D3-KL; Wed, 24 Jul 2013 07:27:58 +0000 Received: from mail-pb0-x233.google.com ([2607:f8b0:400e:c01::233]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1V1tUJ-0003CX-Dd for linux-arm-kernel@lists.infradead.org; Wed, 24 Jul 2013 07:27:56 +0000 Received: by mail-pb0-f51.google.com with SMTP id um15so9407907pbc.24 for ; Wed, 24 Jul 2013 00:27:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:date:message-id:subject; bh=ID8zlF487cv2Iacdheg1FBx+w8ML/53IWs0ItomKh3g=; b=WOUUzPvDYxdId9ujejonE7TFDcLwKrQbU9kPAsGtT8Ae5/g3xvYhQsi4E3WQ/DL+Ox h1XURN1pYdmQwpiiGv/WlKd52v60y1HtQNMAa5C659GVzssL5Ga1/9pSBhqFRlOOKa07 jdk/RPw5+4VM60mDRsSnGgJxXzPKtXUe1XixNEwFKFpCiW8+UO3XApiTnFfYtRKyl0kL GhG9uwXAb/iOgggLQccW3FLt1HGuUOctMvYS4xOGKE3LJ5gskO+bOus9qiWOrjbDRwCi HbIKa8DgpPYOw3jQW6NzKt/GO/y1fEvCqIfkOh5Lb+iQsPK/HMUhBuixN57xj5/tXxWA TuEA== X-Received: by 10.67.2.7 with SMTP id bk7mr41190074pad.50.1374650850552; Wed, 24 Jul 2013 00:27:30 -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 zv11sm49827872pab.3.2013.07.24.00.27.28 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 24 Jul 2013 00:27:29 -0700 (PDT) From: Magnus Damm To: linux-sh@vger.kernel.org Date: Wed, 24 Jul 2013 16:27:39 +0900 Message-Id: <20130724072739.28333.44251.sendpatchset@w520> Subject: [PATCH] ARM: shmobile: sh73a0: Rely on DT for SMP CPU info X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130724_032755_582299_4C3F481B X-CRM114-Status: GOOD ( 10.12 ) X-Spam-Score: -2.0 (--) Cc: horms@verge.net.au, Magnus Damm , 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: , 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=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: Magnus Damm Remove sh73a0 specific ->smp_init_cpus() callback and instead of relying on shmobile_smp_init_cpus() simply use DT for CPU core information. This assumes that DT_MACHINE_START is used which is the case when AG5EVM and Kota2 are removed. Signed-off-by: Magnus Damm --- arch/arm/mach-shmobile/smp-sh73a0.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) --- 0001/arch/arm/mach-shmobile/smp-sh73a0.c +++ work/arch/arm/mach-shmobile/smp-sh73a0.c 2013-07-24 15:59:16.000000000 +0900 @@ -62,6 +62,8 @@ static int sh73a0_boot_secondary(unsigne static void __init sh73a0_smp_prepare_cpus(unsigned int max_cpus) { + /* setup sh73a0 specific SCU base */ + shmobile_scu_base = IOMEM(SH73A0_SCU_BASE); scu_enable(shmobile_scu_base); /* Map the reset vector (in headsmp-scu.S, headsmp.S) */ @@ -74,14 +76,6 @@ static void __init sh73a0_smp_prepare_cp scu_power_mode(shmobile_scu_base, SCU_PM_NORMAL); } -static void __init sh73a0_smp_init_cpus(void) -{ - /* setup sh73a0 specific SCU base */ - shmobile_scu_base = IOMEM(SH73A0_SCU_BASE); - - shmobile_smp_init_cpus(scu_get_core_count(shmobile_scu_base)); -} - #ifdef CONFIG_HOTPLUG_CPU static int sh73a0_cpu_kill(unsigned int cpu) { @@ -120,7 +114,6 @@ static int sh73a0_cpu_disable(unsigned i #endif /* CONFIG_HOTPLUG_CPU */ struct smp_operations sh73a0_smp_ops __initdata = { - .smp_init_cpus = sh73a0_smp_init_cpus, .smp_prepare_cpus = sh73a0_smp_prepare_cpus, .smp_boot_secondary = sh73a0_boot_secondary, #ifdef CONFIG_HOTPLUG_CPU