From patchwork Thu May 14 16:13:01 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 48519 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f198.google.com (mail-wi0-f198.google.com [209.85.212.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 9656121411 for ; Thu, 14 May 2015 16:19:33 +0000 (UTC) Received: by wizk4 with SMTP id k4sf24394670wiz.2 for ; Thu, 14 May 2015 09:19:32 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:subject:date:message-id:cc :precedence:list-id:list-unsubscribe:list-archive:list-post :list-help:list-subscribe:mime-version:content-type :content-transfer-encoding:sender:errors-to:x-original-sender :x-original-authentication-results:mailing-list; bh=A8hvFgGzy2gk43IUufWaAlaHUHjUAY1UAOlBFE+3vnQ=; b=BXVnx7Fr4pV+QQCQflqkcePKssm5wFpkArH2CmUYmdpCdkm0gfD58ACLFzCc042nyc 5mI1wmTZe/IFO2vAqxtG+rWyOEJ4iuTC4PGKUcmmtCXcuhAsUzGiU64rloEVIH60diL4 Ho2nmA8eJjxTObvtgHrfECmLcOrhsx53kcjP4lWpuLdziksJr4LgYrmNq0Ln0715UU4Q 27YgDbgnb4KYt0afLAHO09xV1n7lorSxN9M0iuuSNdNiebtdFg3fxVkfO/JNrQn01QJM A0pXrzr8u+BhI1ROzIFJZOxRPptTSoUeoy/fV4d0Qy/j7MPVfObELucodekjFPgmG+hh mcDw== X-Gm-Message-State: ALoCoQky65tGb3vnLCeREgG13oYcI6Ew3/4FqN6LDlQzy/1QdO96jKWjbshvRmVl4XaSjRYMTcUB X-Received: by 10.180.86.226 with SMTP id s2mr796735wiz.0.1431620372896; Thu, 14 May 2015 09:19:32 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.36.227 with SMTP id t3ls437053laj.72.gmail; Thu, 14 May 2015 09:19:32 -0700 (PDT) X-Received: by 10.152.9.66 with SMTP id x2mr3840158laa.36.1431620372660; Thu, 14 May 2015 09:19:32 -0700 (PDT) Received: from mail-la0-f46.google.com (mail-la0-f46.google.com. [209.85.215.46]) by mx.google.com with ESMTPS id k6si14846960lbg.140.2015.05.14.09.19.32 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 May 2015 09:19:32 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.46 as permitted sender) client-ip=209.85.215.46; Received: by laat2 with SMTP id t2so75033024laa.1 for ; Thu, 14 May 2015 09:19:32 -0700 (PDT) X-Received: by 10.112.219.70 with SMTP id pm6mr3720312lbc.41.1431620372528; Thu, 14 May 2015 09:19:32 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.108.230 with SMTP id hn6csp1380611lbb; Thu, 14 May 2015 09:19:31 -0700 (PDT) X-Received: by 10.70.46.74 with SMTP id t10mr9722145pdm.118.1431620370805; Thu, 14 May 2015 09:19:30 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id yv1si33168121pac.33.2015.05.14.09.19.29 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 May 2015 09:19:30 -0700 (PDT) Received-SPF: none (google.com: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org does not designate permitted sender hosts) client-ip=2001:1868:205::9; 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 1Ysvp1-0000om-2p; Thu, 14 May 2015 16:17:19 +0000 Received: from mail-la0-f44.google.com ([209.85.215.44]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YsvlI-0005gA-UY for linux-arm-kernel@lists.infradead.org; Thu, 14 May 2015 16:13:30 +0000 Received: by laat2 with SMTP id t2so74775015laa.1 for ; Thu, 14 May 2015 09:13:06 -0700 (PDT) X-Received: by 10.152.88.46 with SMTP id bd14mr3719833lab.71.1431619986018; Thu, 14 May 2015 09:13:06 -0700 (PDT) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id r6sm6264806lbw.10.2015.05.14.09.13.04 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 May 2015 09:13:05 -0700 (PDT) From: Linus Walleij To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 04/10] ARM: ux500: get SCU base from device tree Date: Thu, 14 May 2015 18:13:01 +0200 Message-Id: <1431619981-14972-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.9.3 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150514_091329_259851_04D4606A X-CRM114-Status: GOOD ( 12.23 ) X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.215.44 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.215.44 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders Cc: Linus Walleij 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+patch=linaro.org@lists.infradead.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: linus.walleij@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.46 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 The SMP startup/shutdown code relied on a static SCU base address, let's get this from the device tree instead. Signed-off-by: Linus Walleij --- arch/arm/mach-ux500/platsmp.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-ux500/platsmp.c b/arch/arm/mach-ux500/platsmp.c index 1e13d0a8ad77..62b1de922bd8 100644 --- a/arch/arm/mach-ux500/platsmp.c +++ b/arch/arm/mach-ux500/platsmp.c @@ -16,6 +16,8 @@ #include #include #include +#include +#include #include #include @@ -122,8 +124,13 @@ static void __init wakeup_secondary(void) static void __init ux500_smp_init_cpus(void) { unsigned int i, ncores; + struct device_node *np; - scu_base = ioremap(U8500_SCU_BASE, 0x100); + np = of_find_compatible_node(NULL, NULL, "arm,cortex-a9-scu"); + scu_base = of_iomap(np, 0); + of_node_put(np); + if (!scu_base) + return; backupram = ioremap(U8500_BACKUPRAM0_BASE, SZ_8K); ncores = scu_get_core_count(scu_base);