From patchwork Tue May 15 03:59:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 10399867 X-Patchwork-Delegate: agross@codeaurora.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0E007601C8 for ; Tue, 15 May 2018 04:00:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9F718284DA for ; Tue, 15 May 2018 04:00:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 93F3828604; Tue, 15 May 2018 04:00:00 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 08C91284DA for ; Tue, 15 May 2018 04:00:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752136AbeEOD76 (ORCPT ); Mon, 14 May 2018 23:59:58 -0400 Received: from mail-pg0-f67.google.com ([74.125.83.67]:35950 "EHLO mail-pg0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752097AbeEOD74 (ORCPT ); Mon, 14 May 2018 23:59:56 -0400 Received: by mail-pg0-f67.google.com with SMTP id z70-v6so6391393pgz.3 for ; Mon, 14 May 2018 20:59:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id; bh=8WMGWrLk2ON7ni+rsM4aoNeH6/RPf+26goRcUcgGFJE=; b=CsYUcFIbryBNliIsLTSZMZlGKkPeBefCSIAHFASwUmKh1apuWQAvKaznIQuVlWfeGH g5P1FpChn75zOGZUHjhOrNEtoEK4bEhEEynTQG2lI7L3fxdg4KfdM+PNj7qhDd/S2QEl cJSb2+nCqHbta6tH8xs1TiwjNB+RDoaPieFUc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=8WMGWrLk2ON7ni+rsM4aoNeH6/RPf+26goRcUcgGFJE=; b=nkcbZ3i94Zj518r2up+rB2zmGJ5WJSPjpv5zcV9zesVxLly3JVV+G1VzMgVKck0TsM jJyGwrCb82qP/TF2in2AsQqugtTPXjqDDdKkAEyB1oOOChB+Yufch5OW858sV3d8JZqA gz+7oGwTqXhyCwWadouhk2tiRnTXKQ+/YBwZsMF/imbRzOcrypccwWjNyQT7IxFGJt2C Qv+jCmzbzihPCglyr7g4ghd0GzwAAz7bu8gn3/ACWRYlu+PLDZadlD/DnvMee7+9WhDz dizq7VHCFJ/0pie0eSd1IfOmQxoPLJD2H6IA1ZG7eMfu+8/rRqwCOa4hfhKs4DMhCzvX wB5A== X-Gm-Message-State: ALKqPweUTMCpt39+cZh4mloPQ2J9RxBFOVlPLluItFK1/kmd8lU7R/vt HG09pwiMP8Q93EoGEwDuiuB3Ag== X-Google-Smtp-Source: AB8JxZo9rdkaALq2eYWVpyRc+TbOEkMLK193cx1me5lLNEOZWCGqPK5DF2nlfpoWTqUUC5VRFf1kbw== X-Received: by 2002:a62:c103:: with SMTP id i3-v6mr13228253pfg.148.1526356796229; Mon, 14 May 2018 20:59:56 -0700 (PDT) Received: from tictac2.mtv.corp.google.com ([2620:0:1000:1511:bde7:107f:fd5:44c8]) by smtp.gmail.com with ESMTPSA id d62-v6sm17711542pga.29.2018.05.14.20.59.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 May 2018 20:59:55 -0700 (PDT) From: Douglas Anderson To: Andy Gross Cc: Bjorn Andersson , swboyd@chromium.org, Douglas Anderson , devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Rob Herring , David Brown , Will Deacon , Mark Rutland , linux-soc@vger.kernel.org, Catalin Marinas , linux-arm-kernel@lists.infradead.org Subject: [PATCH v2] arm64: dts: qcom: sdm845: Sort nodes in the soc by address Date: Mon, 14 May 2018 20:59:22 -0700 Message-Id: <20180515035922.179060-1-dianders@chromium.org> X-Mailer: git-send-email 2.17.0.441.gb46fe60e1d-goog Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This is pure-churn and should be a no-op. I'm doing it in the hopes of reducing merge conflicts. When things are sorted in a sane way (and by base address seems sane) then it's less likely that future patches will cause merge conflicts. Signed-off-by: Douglas Anderson Acked-by: Bjorn Andersson --- Changes in v2: - rebase atop tree today arch/arm64/boot/dts/qcom/sdm845.dtsi | 96 ++++++++++++++-------------- 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi index 7c85e7c596db..96dd4b2a41d6 100644 --- a/arch/arm64/boot/dts/qcom/sdm845.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi @@ -198,6 +198,54 @@ ranges = <0 0 0 0xffffffff>; compatible = "simple-bus"; + gcc: clock-controller@100000 { + compatible = "qcom,gcc-sdm845"; + reg = <0x100000 0x1f0000>; + #clock-cells = <1>; + #reset-cells = <1>; + #power-domain-cells = <1>; + }; + + tcsr_mutex_regs: syscon@1f40000 { + compatible = "syscon"; + reg = <0x1f40000 0x40000>; + }; + + tlmm: pinctrl@3400000 { + compatible = "qcom,sdm845-pinctrl"; + reg = <0x03400000 0xc00000>; + interrupts = ; + gpio-controller; + #gpio-cells = <2>; + interrupt-controller; + #interrupt-cells = <2>; + }; + + spmi_bus: spmi@c440000 { + compatible = "qcom,spmi-pmic-arb"; + reg = <0xc440000 0x1100>, + <0xc600000 0x2000000>, + <0xe600000 0x100000>, + <0xe700000 0xa0000>, + <0xc40a000 0x26000>; + reg-names = "core", "chnls", "obsrvr", "intr", "cnfg"; + interrupt-names = "periph_irq"; + interrupts = ; + qcom,ee = <0>; + qcom,channel = <0>; + #address-cells = <2>; + #size-cells = <0>; + interrupt-controller; + #interrupt-cells = <4>; + cell-index = <0>; + }; + + apss_shared: mailbox@17990000 { + compatible = "qcom,sdm845-apss-shared"; + reg = <0x17990000 0x1000>; + #mbox-cells = <1>; + }; + intc: interrupt-controller@17a00000 { compatible = "arm,gic-v3"; #address-cells = <1>; @@ -218,24 +266,6 @@ }; }; - gcc: clock-controller@100000 { - compatible = "qcom,gcc-sdm845"; - reg = <0x100000 0x1f0000>; - #clock-cells = <1>; - #reset-cells = <1>; - #power-domain-cells = <1>; - }; - - tlmm: pinctrl@3400000 { - compatible = "qcom,sdm845-pinctrl"; - reg = <0x03400000 0xc00000>; - interrupts = ; - gpio-controller; - #gpio-cells = <2>; - interrupt-controller; - #interrupt-cells = <2>; - }; - timer@17c90000 { #address-cells = <1>; #size-cells = <1>; @@ -293,35 +323,5 @@ status = "disabled"; }; }; - - spmi_bus: spmi@c440000 { - compatible = "qcom,spmi-pmic-arb"; - reg = <0xc440000 0x1100>, - <0xc600000 0x2000000>, - <0xe600000 0x100000>, - <0xe700000 0xa0000>, - <0xc40a000 0x26000>; - reg-names = "core", "chnls", "obsrvr", "intr", "cnfg"; - interrupt-names = "periph_irq"; - interrupts = ; - qcom,ee = <0>; - qcom,channel = <0>; - #address-cells = <2>; - #size-cells = <0>; - interrupt-controller; - #interrupt-cells = <4>; - cell-index = <0>; - }; - - tcsr_mutex_regs: syscon@1f40000 { - compatible = "syscon"; - reg = <0x1f40000 0x40000>; - }; - - apss_shared: mailbox@17990000 { - compatible = "qcom,sdm845-apss-shared"; - reg = <0x17990000 0x1000>; - #mbox-cells = <1>; - }; }; };