From patchwork Wed May 9 16:44:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sudeep Holla X-Patchwork-Id: 135312 Delivered-To: patch@linaro.org Received: by 10.46.151.6 with SMTP id r6csp5860788lji; Wed, 9 May 2018 09:45:04 -0700 (PDT) X-Google-Smtp-Source: AB8JxZrclc2hP3ghvOpPQktbepCFs42Tvo43JqWj7KswJSbQ2D/DDugEGLOLqjfXMVTZRpCHhRH/ X-Received: by 2002:a63:6842:: with SMTP id d63-v6mr36703340pgc.304.1525884304433; Wed, 09 May 2018 09:45:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525884304; cv=none; d=google.com; s=arc-20160816; b=mBha3w1bTi/icSigKOfT0aehFEjAP9LvQyX/JfOljscai1QGLQDaa4XudMrBdsL77U zXdVpgavby3Q0lmcEvpLlfX5QcM+m2i55kA+mZaFOeLowY496bXz6k3kQQdXrvrzQ8hX l/BFlMxkWmz0e0d/UcCnHupvpv5pjIvJOirGawXtPUoFNmYSyJvskkFgXo7C6kUuy3/X LFeeg58HZvTw6Zmws+JR2ssQCl6hw61/BxSQ0v2Bn32aHRWm5MU3FX5QdV2KlMgHUFdU Fd/rain4HsEwaHEK8pAFB2Rap1OBBtReDDInMr5QOqCc6vIh9/3xDq+DdkJmrB3TtQ3o jiGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=c2omjGgwi9qT2G4aaELN2R1L3Q8pwxtfQgt0Q5Ld7UY=; b=C7BtTyeYfm+0CR6+CjBNgxsM36JGMQfCdeDtjBAoY+MM2ICjK4/p+YAVcyNZQvhhLk IIMGIDOEmgLg9duoE9yctssik+YuVKjRJWmd+S3MLRiHoNnv1vedmu1ddfcIltQC4w18 Z1B0P5pP+wAY6zM08852+7IERqqvXipEYoSdlFc/emEpM2RIbrQB9urjO5O0ErinGMGb H2+jJsL/AMt2742uaitKYseidMnOz41amNMaUA5lVrBvvwOnKEixF73saOW1gMcsB21x 5Ao+a+JrceaqpDYdTY5n8v4H9DEfYPZwQcHivYlMqpoD/g1dD7/wfYKKWcTcKQzx84wg fvdQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 88-v6si25917946pla.315.2018.05.09.09.45.04; Wed, 09 May 2018 09:45:04 -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; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965621AbeEIQpD (ORCPT + 6 others); Wed, 9 May 2018 12:45:03 -0400 Received: from foss.arm.com ([217.140.101.70]:46856 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964989AbeEIQpD (ORCPT ); Wed, 9 May 2018 12:45:03 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id D74A815BE; Wed, 9 May 2018 09:45:02 -0700 (PDT) Received: from e107155-lin.cambridge.arm.com (unknown [10.1.210.28]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id A6CA83F25D; Wed, 9 May 2018 09:45:01 -0700 (PDT) From: Sudeep Holla To: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, Liviu Dudau Cc: Sudeep Holla , Rob Herring , Linus Walleij Subject: [PATCH 3/3] arm64: dts: juno/rtsm: re-structure motherboard includes Date: Wed, 9 May 2018 17:44:51 +0100 Message-Id: <1525884291-18851-3-git-send-email-sudeep.holla@arm.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1525884291-18851-1-git-send-email-sudeep.holla@arm.com> References: <1525884291-18851-1-git-send-email-sudeep.holla@arm.com> Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org It is a bit unorthodox to just include a file in the middle of a another DTS file, it breaks the pattern from other device trees and also makes it really hard to reference things across the files with phandles. Restructure the include for the Juno/RTSM motherboards to happen at the top of the file, reference the target nodes directly, and indent the motherboard .dtsi files to reflect their actual depth in the hierarchy. This is a purely syntactic change that result in the same DTB files from the DTS/DTSI files. This is based on similar patch from Linus Walleij for ARM Vexpress platforms. Cc: Liviu Dudau Cc: Linus Walleij Signed-off-by: Sudeep Holla --- arch/arm64/boot/dts/arm/juno-base.dtsi | 3 +-- arch/arm64/boot/dts/arm/juno-motherboard.dtsi | 4 ++++ arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts | 4 ++-- arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi | 5 ++++- 4 files changed, 11 insertions(+), 5 deletions(-) Hi, Posting this patch with -b(aka ignore-spaces option for review purpose. Regards, Sudeep -- 2.7.4 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Acked-by: Liviu Dudau Reviewed-by: Linus Walleij diff --git a/arch/arm64/boot/dts/arm/juno-base.dtsi b/arch/arm64/boot/dts/arm/juno-base.dtsi index b74e462c6658..ce56a4acda4f 100644 --- a/arch/arm64/boot/dts/arm/juno-base.dtsi +++ b/arch/arm64/boot/dts/arm/juno-base.dtsi @@ -1,5 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 #include "juno-clocks.dtsi" +#include "juno-motherboard.dtsi" / { /* @@ -795,8 +796,6 @@ <0 0 10 &gic 0 0 0 167 IRQ_TYPE_LEVEL_HIGH>, <0 0 11 &gic 0 0 0 168 IRQ_TYPE_LEVEL_HIGH>, <0 0 12 &gic 0 0 0 169 IRQ_TYPE_LEVEL_HIGH>; - - /include/ "juno-motherboard.dtsi" }; site2: tlx@60000000 { diff --git a/arch/arm64/boot/dts/arm/juno-motherboard.dtsi b/arch/arm64/boot/dts/arm/juno-motherboard.dtsi index 70e3409d86a3..1792b074e9a3 100644 --- a/arch/arm64/boot/dts/arm/juno-motherboard.dtsi +++ b/arch/arm64/boot/dts/arm/juno-motherboard.dtsi @@ -7,6 +7,8 @@ * */ +/ { + smb@8000000 { mb_clk24mhz: clk24mhz { compatible = "fixed-clock"; #clock-cells = <0>; @@ -287,3 +289,5 @@ }; }; }; + }; +}; diff --git a/arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts b/arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts index 06c8117e812a..602f63f72c37 100644 --- a/arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts +++ b/arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts @@ -12,6 +12,8 @@ /memreserve/ 0x80000000 0x00010000; +#include "rtsm_ve-motherboard.dtsi" + / { model = "RTSM_VE_AEMv8A"; compatible = "arm,rtsm_ve,aemv8a", "arm,vexpress"; @@ -162,7 +164,5 @@ <0 0 40 &gic 0 40 4>, <0 0 41 &gic 0 41 4>, <0 0 42 &gic 0 42 4>; - - /include/ "rtsm_ve-motherboard.dtsi" }; }; diff --git a/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi b/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi index 1134e5d8df18..d2dbc3f39263 100644 --- a/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi +++ b/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi @@ -7,7 +7,8 @@ * * VEMotherBoard.lisa */ - +/ { + smb@8000000 { motherboard { arm,v2m-memory-map = "rs1"; compatible = "arm,vexpress,v2m-p1", "simple-bus"; @@ -274,3 +275,5 @@ }; }; }; + }; +};