From patchwork Fri May 4 22:03:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 10381745 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 2CA1B6037D for ; Fri, 4 May 2018 22:04:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0862F29574 for ; Fri, 4 May 2018 22:04:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EF98A29586; Fri, 4 May 2018 22:04:36 +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 86B0229574 for ; Fri, 4 May 2018 22:04:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751740AbeEDWEe (ORCPT ); Fri, 4 May 2018 18:04:34 -0400 Received: from mail-pg0-f65.google.com ([74.125.83.65]:44562 "EHLO mail-pg0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751621AbeEDWEc (ORCPT ); Fri, 4 May 2018 18:04:32 -0400 Received: by mail-pg0-f65.google.com with SMTP id 82-v6so16295466pge.11 for ; Fri, 04 May 2018 15:04:32 -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=E+QHgMGBMrhoKiiTELB7YrZY+AR3lNz2+onvSlosTyE=; b=RAPacjb5XrYvuYZZSr4d+2RRyaWjl1McYlU3nBvzsyjEngcJ1USDP8ZSEcGEDrZtD2 dtQ+STq9Wu7Ii2jI0hGpxVpGc8vwsLsOoPBuu3c3Z38G+yT2htWNCzY4KezuZw1shRYU 5yU1KdSQRzT+cnOQ70hF07aXLIJvfVpDIAilQ= 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=E+QHgMGBMrhoKiiTELB7YrZY+AR3lNz2+onvSlosTyE=; b=Z68qRxEDqHZPszOyqOAPYm+5u4qFDbvGTKPFK4RnL6Ni88BiA+enniEck8Pgv9vtEu +JpPUkcLo7csjyJJJTY3unkQKnEAZKW8GSDbwYGD9oNNcD70eQSwY/rNImX6myw4q4wl VvH0hFPZhicZUAZZ5gLzrNOjxSCoaBhvDbYNCxmEA0jNjYSmVAVoEJ/+ulQ70tYXiyiY EdpjV/2Jmk8yvdipttvkRD6XtvmlaZPPJ/ecoGC236w3O7jzm//fcK0sVYMflQoZwRLK bMflrxzFZSy8Fb/LlALFEkZvN/jznS+M8zY9wwseyC/WJyUndgc+KrVU97ZHloMf3bKF jq9w== X-Gm-Message-State: ALQs6tCafOce4tvb+DmaDrFxLfP3JkbN7dQIrc0uSlbPBWT1vNrujbdw 0+oIl6afnLpQN56nl5i9dutApw== X-Google-Smtp-Source: AB8JxZpNCXYYIw0UkPJG59+KTU2JhdWiFGHeunKN9JVZyIJteAHLR/42zK7sBrtOfLTCLbChaGb/iQ== X-Received: by 2002:a17:902:b492:: with SMTP id y18-v6mr29281816plr.2.1525471472197; Fri, 04 May 2018 15:04:32 -0700 (PDT) Received: from tictac2.mtv.corp.google.com ([2620:0:1000:1c10:1976:24c6:964c:adf8]) by smtp.gmail.com with ESMTPSA id o4sm33774444pfg.129.2018.05.04.15.04.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 04 May 2018 15:04:30 -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] arm64: dts: qcom: sdm845: Sort nodes in the soc by address Date: Fri, 4 May 2018 15:03:56 -0700 Message-Id: <20180504220356.261711-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 --- arch/arm64/boot/dts/qcom/sdm845.dtsi | 152 +++++++++++++-------------- 1 file changed, 76 insertions(+), 76 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi index 486ace9a9e8b..101350743bd2 100644 --- a/arch/arm64/boot/dts/qcom/sdm845.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi @@ -158,32 +158,50 @@ ranges = <0 0 0 0xffffffff>; compatible = "simple-bus"; - intc: interrupt-controller@17a00000 { - compatible = "arm,gic-v3"; + gcc: clock-controller@100000 { + compatible = "qcom,gcc-sdm845"; + reg = <0x100000 0x1f0000>; + #clock-cells = <1>; + #reset-cells = <1>; + #power-domain-cells = <1>; + }; + + geniqup@ac0000 { + compatible = "qcom,geni-se-qup"; + reg = <0xac0000 0x6000>; + clock-names = "m-ahb", "s-ahb"; + clocks = <&gcc 105>, + <&gcc 106>; #address-cells = <1>; #size-cells = <1>; ranges; - #interrupt-cells = <3>; - interrupt-controller; - reg = <0x17a00000 0x10000>, /* GICD */ - <0x17a60000 0x100000>; /* GICR * 8 */ - interrupts = ; + status = "disabled"; - gic-its@17a40000 { - compatible = "arm,gic-v3-its"; - msi-controller; - #msi-cells = <1>; - reg = <0x17a40000 0x20000>; + uart2: serial@a84000 { + compatible = "qcom,geni-debug-uart"; + reg = <0xa84000 0x4000>; + clock-names = "se"; + clocks = <&gcc 89>; + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&qup_uart2_default>; + pinctrl-1 = <&qup_uart2_sleep>; + interrupts = ; status = "disabled"; }; - }; - gcc: clock-controller@100000 { - compatible = "qcom,gcc-sdm845"; - reg = <0x100000 0x1f0000>; - #clock-cells = <1>; - #reset-cells = <1>; - #power-domain-cells = <1>; + i2c10: i2c@a88000 { + compatible = "qcom,geni-i2c"; + reg = <0xa88000 0x4000>; + clock-names = "se"; + clocks = <&gcc 91>; + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&qup_i2c10_default>; + pinctrl-1 = <&qup_i2c10_sleep>; + interrupts = ; + #address-cells = <1>; + #size-cells = <0>; + status = "disabled"; + }; }; tlmm: pinctrl@3400000 { @@ -224,6 +242,45 @@ }; }; + 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>; + }; + + intc: interrupt-controller@17a00000 { + compatible = "arm,gic-v3"; + #address-cells = <1>; + #size-cells = <1>; + ranges; + #interrupt-cells = <3>; + interrupt-controller; + reg = <0x17a00000 0x10000>, /* GICD */ + <0x17a60000 0x100000>; /* GICR * 8 */ + interrupts = ; + + gic-its@17a40000 { + compatible = "arm,gic-v3-its"; + msi-controller; + #msi-cells = <1>; + reg = <0x17a40000 0x20000>; + status = "disabled"; + }; + }; + timer@17c90000 { #address-cells = <1>; #size-cells = <1>; @@ -281,62 +338,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>; - }; - - geniqup@ac0000 { - compatible = "qcom,geni-se-qup"; - reg = <0xac0000 0x6000>; - clock-names = "m-ahb", "s-ahb"; - clocks = <&gcc 105>, - <&gcc 106>; - #address-cells = <1>; - #size-cells = <1>; - ranges; - status = "disabled"; - - uart2: serial@a84000 { - compatible = "qcom,geni-debug-uart"; - reg = <0xa84000 0x4000>; - clock-names = "se"; - clocks = <&gcc 89>; - pinctrl-names = "default", "sleep"; - pinctrl-0 = <&qup_uart2_default>; - pinctrl-1 = <&qup_uart2_sleep>; - interrupts = ; - status = "disabled"; - }; - - i2c10: i2c@a88000 { - compatible = "qcom,geni-i2c"; - reg = <0xa88000 0x4000>; - clock-names = "se"; - clocks = <&gcc 91>; - pinctrl-names = "default", "sleep"; - pinctrl-0 = <&qup_i2c10_default>; - pinctrl-1 = <&qup_i2c10_sleep>; - interrupts = ; - #address-cells = <1>; - #size-cells = <0>; - status = "disabled"; - }; - }; }; };