From patchwork Fri Jul 31 12:22:07 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 51768 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f197.google.com (mail-wi0-f197.google.com [209.85.212.197]) by patches.linaro.org (Postfix) with ESMTPS id 2B55C22A8D for ; Fri, 31 Jul 2015 12:22:23 +0000 (UTC) Received: by wixh2 with SMTP id h2sf8004567wix.0 for ; Fri, 31 Jul 2015 05:22:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=B3J1JXAH3pd0+14R1cuyFhuTwX1iLPaoa+JYHXNA5TY=; b=Ih9uvZvJihkEi0Dn3OIQBqPKRW+Z7gneKpFXXnv8mDfSbEW4jLDW3xyo/tcmHxs1ku wkqD3Az7cHAXHBDcqmNAfolu0rfCzvZLIHCEMeyL92JFLZZzHO8AbXbyaBzUqxyblIlU ybqo8rCgXJvgNzAfig11zPsXPMS4XqtHilJ8baaU/cC2rCMTLDU2AYOclfnw0cuM5aZg SMEfNgH7V5jsWKBg+/ezASPq2F7LdM2WIbZKbmHquO39sDjUU7rKQZSR4EBPCMtZvo2M V9pvc0+dnydYsrAakMd/FTVnk8UxJb/duhCdWQwTcYceTaEdh5XTOWixQKQzqUg78gvV MXQA== X-Gm-Message-State: ALoCoQnx2fJCVgSLCHFM8j5v9JfPN/7OcnIZcuZcsT6StKVTQpGQkqfb35kK4TwLOI0viDQLOuJr X-Received: by 10.152.9.99 with SMTP id y3mr854709laa.10.1438345342428; Fri, 31 Jul 2015 05:22:22 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.219.4 with SMTP id pk4ls305508lac.90.gmail; Fri, 31 Jul 2015 05:22:22 -0700 (PDT) X-Received: by 10.152.9.137 with SMTP id z9mr2546513laa.68.1438345342281; Fri, 31 Jul 2015 05:22:22 -0700 (PDT) Received: from mail-lb0-f175.google.com (mail-lb0-f175.google.com. [209.85.217.175]) by mx.google.com with ESMTPS id kd4si3536416lbc.42.2015.07.31.05.22.21 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 Jul 2015 05:22:21 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.175 as permitted sender) client-ip=209.85.217.175; Received: by lbbud7 with SMTP id ud7so41241225lbb.3 for ; Fri, 31 Jul 2015 05:22:21 -0700 (PDT) X-Received: by 10.112.198.74 with SMTP id ja10mr2515747lbc.19.1438345341832; Fri, 31 Jul 2015 05:22:21 -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.7.198 with SMTP id l6csp351743lba; Fri, 31 Jul 2015 05:22:20 -0700 (PDT) X-Received: by 10.50.70.34 with SMTP id j2mr5644899igu.54.1438345340809; Fri, 31 Jul 2015 05:22:20 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id qz11si9940247pac.236.2015.07.31.05.22.19; Fri, 31 Jul 2015 05:22:20 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751635AbbGaMWT (ORCPT + 8 others); Fri, 31 Jul 2015 08:22:19 -0400 Received: from mail-la0-f47.google.com ([209.85.215.47]:32967 "EHLO mail-la0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751621AbbGaMWS (ORCPT ); Fri, 31 Jul 2015 08:22:18 -0400 Received: by laah7 with SMTP id h7so42934360laa.0 for ; Fri, 31 Jul 2015 05:22:16 -0700 (PDT) X-Received: by 10.112.146.106 with SMTP id tb10mr2485442lbb.22.1438345336548; Fri, 31 Jul 2015 05:22:16 -0700 (PDT) Received: from localhost.localdomain ([85.235.11.236]) by smtp.gmail.com with ESMTPSA id r2sm878050laj.6.2015.07.31.05.22.13 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 Jul 2015 05:22:14 -0700 (PDT) From: Linus Walleij To: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org Cc: Linus Walleij Subject: [PATCH 1/2] ARM: ux500: add an SMP enablement type and move cpu nodes Date: Fri, 31 Jul 2015 14:22:07 +0200 Message-Id: <1438345327-16680-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 2.4.3 Sender: devicetree-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: devicetree@vger.kernel.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.217.175 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 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , The "cpus" node cannot be inside the "soc" node, while this works for the CoreSight blocks, the early boot code will look for "cpus" directly under the root node, so this is a hard convention. So move the CPU nodes. Augment the "reg" property to match what is actually in the hardware: 0x300 and 0x301 respectively. Then add an SMP enablement type to be used by the SMP init code, "ste,dbx500-smp". Signed-off-by: Linus Walleij --- Documentation/devicetree/bindings/arm/cpus.txt | 1 + arch/arm/boot/dts/ste-dbx5x0.dtsi | 53 +++++++++++++------------- 2 files changed, 28 insertions(+), 26 deletions(-) diff --git a/Documentation/devicetree/bindings/arm/cpus.txt b/Documentation/devicetree/bindings/arm/cpus.txt index d6b794cef0b8..91e6e5c478d0 100644 --- a/Documentation/devicetree/bindings/arm/cpus.txt +++ b/Documentation/devicetree/bindings/arm/cpus.txt @@ -199,6 +199,7 @@ nodes to be present and contain the properties described below. "qcom,kpss-acc-v1" "qcom,kpss-acc-v2" "rockchip,rk3066-smp" + "ste,dbx500-smp" - cpu-release-addr Usage: required for systems that have an "enable-method" diff --git a/arch/arm/boot/dts/ste-dbx5x0.dtsi b/arch/arm/boot/dts/ste-dbx5x0.dtsi index a56bf890afaf..56fa0bcb931b 100644 --- a/arch/arm/boot/dts/ste-dbx5x0.dtsi +++ b/arch/arm/boot/dts/ste-dbx5x0.dtsi @@ -15,6 +15,33 @@ #include "skeleton.dtsi" / { + cpus { + #address-cells = <1>; + #size-cells = <0>; + enable-method = "ste,dbx500-smp"; + + cpu-map { + cluster0 { + core0 { + cpu = <&CPU0>; + }; + core1 { + cpu = <&CPU1>; + }; + }; + }; + CPU0: cpu@300 { + device_type = "cpu"; + compatible = "arm,cortex-a9"; + reg = <0x300>; + }; + CPU1: cpu@301 { + device_type = "cpu"; + compatible = "arm,cortex-a9"; + reg = <0x301>; + }; + }; + soc { #address-cells = <1>; #size-cells = <1>; @@ -22,32 +49,6 @@ interrupt-parent = <&intc>; ranges; - cpus { - #address-cells = <1>; - #size-cells = <0>; - - cpu-map { - cluster0 { - core0 { - cpu = <&CPU0>; - }; - core1 { - cpu = <&CPU1>; - }; - }; - }; - CPU0: cpu@0 { - device_type = "cpu"; - compatible = "arm,cortex-a9"; - reg = <0>; - }; - CPU1: cpu@1 { - device_type = "cpu"; - compatible = "arm,cortex-a9"; - reg = <1>; - }; - }; - ptm@801ae000 { compatible = "arm,coresight-etm3x", "arm,primecell"; reg = <0x801ae000 0x1000>;