From patchwork Mon Dec 12 10:02:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 13070887 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C39DAC4332F for ; Mon, 12 Dec 2022 10:03:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231963AbiLLKC6 (ORCPT ); Mon, 12 Dec 2022 05:02:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37078 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231986AbiLLKCs (ORCPT ); Mon, 12 Dec 2022 05:02:48 -0500 Received: from mail-lj1-x230.google.com (mail-lj1-x230.google.com [IPv6:2a00:1450:4864:20::230]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C954CB29 for ; Mon, 12 Dec 2022 02:02:45 -0800 (PST) Received: by mail-lj1-x230.google.com with SMTP id s10so11963549ljg.1 for ; Mon, 12 Dec 2022 02:02:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=3vEjbU4OBSDOtUCM9Wt4KBN/qFz8DdboyKF7lJ0Y5bA=; b=AQZfai+wn5sBVMoXTo5P2/oNGdHPFWIDDOxs/DDGifb5xh4E6qFlNGvvpdTXeNbcro ohnAKOwNnLBSpbUyVnKdLXNwsntNWt35/sNpM8ytt8JscxeWZ4Br4p2A/9uYLihyl/FU h5qWA0YpM9HrFCFstOz/8lB+mMhUiKp63NKLVaRCbBpgrHG7J7Mvl8hjs5xMtrsY70KP /gjTrW3rGZvZSgOvvuiZ7aVwVTVhDKwYOcy2m2e5lwfU9hG8c+qbvyQRmuIfpZ9CzfJi eIzzyjfsmlMCNyGK+dR2wJ2WvLdNczeZDXtVJUod3PBeOpX5Ynv4n0AI7fuITFRLHwZo DtRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=3vEjbU4OBSDOtUCM9Wt4KBN/qFz8DdboyKF7lJ0Y5bA=; b=QCPrM6TyI95Qyc9EsbvvYsZv50g/aVjxTf3vlBwln0hdFC30kU4ck5tgGgqqYk573f ZzFiOdWkOFEYgRiZVIR25kOjVI0PLktvwq5sTVWxHMOFrlXrGQjp30NOcWnAT1P5obMg bACRRjvA887M/CxQPwa+XvN8+k/CVQaIxK7e+TiLQLwg0PbvyRL6McAlR1MaFBTi+h0d 8O1Q28upmmFSKGOxXyZ8MBimdYxdiBrIEdiP64Zf1a2eCvbIXNgp9V8+V28lOw2IPWUJ /UjhoFGOGmHl6AH8EUAYcHNypyKt6uryCdekWL9DY0pVjFqhZ9yVqOoasLR1ZtHc+yno rUiQ== X-Gm-Message-State: ANoB5plqP7kXSZIBmrq+ATPceiR2nkVzt8yUb31DUBJiQwsvbGbzuC/q RCFBqH0Hv8Ui5uLuEHxcW3srqA== X-Google-Smtp-Source: AA0mqf66ulkIMS8nB+P3zSg1GOCpwZC8sb72bFEi+FWYCNNZ4PRqd59cX1A4sUI1Dmoif2oR3KIeYA== X-Received: by 2002:a2e:a58e:0:b0:279:8e95:a3d with SMTP id m14-20020a2ea58e000000b002798e950a3dmr5093821ljp.13.1670839364154; Mon, 12 Dec 2022 02:02:44 -0800 (PST) Received: from krzk-bin.NAT.warszawa.vectranet.pl (088156142067.dynamic-2-waw-k-3-2-0.vectranet.pl. [88.156.142.67]) by smtp.gmail.com with ESMTPSA id i124-20020a2e2282000000b0027712379ec8sm1145101lji.28.2022.12.12.02.02.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Dec 2022 02:02:43 -0800 (PST) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski Cc: Krzysztof Kozlowski , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/6] arm64: dts: qcom: sc7180: order top-level nodes alphabetically Date: Mon, 12 Dec 2022 11:02:27 +0100 Message-Id: <20221212100232.138519-1-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Order top-level nodes like memory, reserved-memory, opp-table-cpu alphabetically for easier code maintenance. No functional change (same dtx_diff). Signed-off-by: Krzysztof Kozlowski Reviewed-by: Konrad Dybcio Reviewed-by: Dmitry Baryshkov --- Changes since v1: 1. New patch --- arch/arm64/boot/dts/qcom/sc7180.dtsi | 144 +++++++++++++-------------- 1 file changed, 72 insertions(+), 72 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qcom/sc7180.dtsi index ea886cf08b4d..6d3e86ce2936 100644 --- a/arch/arm64/boot/dts/qcom/sc7180.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi @@ -27,8 +27,6 @@ / { #address-cells = <2>; #size-cells = <2>; - chosen { }; - aliases { mmc1 = &sdhc_1; mmc2 = &sdhc_2; @@ -54,6 +52,8 @@ aliases { spi11 = &spi11; }; + chosen { }; + clocks { xo_board: xo-board { compatible = "fixed-clock"; @@ -68,62 +68,6 @@ sleep_clk: sleep-clk { }; }; - reserved_memory: reserved-memory { - #address-cells = <2>; - #size-cells = <2>; - ranges; - - hyp_mem: memory@80000000 { - reg = <0x0 0x80000000 0x0 0x600000>; - no-map; - }; - - xbl_mem: memory@80600000 { - reg = <0x0 0x80600000 0x0 0x200000>; - no-map; - }; - - aop_mem: memory@80800000 { - reg = <0x0 0x80800000 0x0 0x20000>; - no-map; - }; - - aop_cmd_db_mem: memory@80820000 { - reg = <0x0 0x80820000 0x0 0x20000>; - compatible = "qcom,cmd-db"; - no-map; - }; - - sec_apps_mem: memory@808ff000 { - reg = <0x0 0x808ff000 0x0 0x1000>; - no-map; - }; - - smem_mem: memory@80900000 { - reg = <0x0 0x80900000 0x0 0x200000>; - no-map; - }; - - tz_mem: memory@80b00000 { - reg = <0x0 0x80b00000 0x0 0x3900000>; - no-map; - }; - - ipa_fw_mem: memory@8b700000 { - reg = <0 0x8b700000 0 0x10000>; - no-map; - }; - - rmtfs_mem: memory@94600000 { - compatible = "qcom,rmtfs-mem"; - reg = <0x0 0x94600000 0x0 0x200000>; - no-map; - - qcom,client-id = <1>; - qcom,vmid = <15>; - }; - }; - cpus { #address-cells = <2>; #size-cells = <0>; @@ -398,6 +342,18 @@ CLUSTER_SLEEP_0: cluster-sleep-0 { }; }; + firmware { + scm { + compatible = "qcom,scm-sc7180", "qcom,scm"; + }; + }; + + memory@80000000 { + device_type = "memory"; + /* We expect the bootloader to fill in the size */ + reg = <0 0x80000000 0 0>; + }; + cpu0_opp_table: opp-table-cpu0 { compatible = "operating-points-v2"; opp-shared; @@ -538,20 +494,69 @@ cpu6_opp16: opp-2553600000 { }; }; - memory@80000000 { - device_type = "memory"; - /* We expect the bootloader to fill in the size */ - reg = <0 0x80000000 0 0>; - }; - pmu { compatible = "arm,armv8-pmuv3"; interrupts = ; }; - firmware { - scm { - compatible = "qcom,scm-sc7180", "qcom,scm"; + psci { + compatible = "arm,psci-1.0"; + method = "smc"; + }; + + reserved_memory: reserved-memory { + #address-cells = <2>; + #size-cells = <2>; + ranges; + + hyp_mem: memory@80000000 { + reg = <0x0 0x80000000 0x0 0x600000>; + no-map; + }; + + xbl_mem: memory@80600000 { + reg = <0x0 0x80600000 0x0 0x200000>; + no-map; + }; + + aop_mem: memory@80800000 { + reg = <0x0 0x80800000 0x0 0x20000>; + no-map; + }; + + aop_cmd_db_mem: memory@80820000 { + reg = <0x0 0x80820000 0x0 0x20000>; + compatible = "qcom,cmd-db"; + no-map; + }; + + sec_apps_mem: memory@808ff000 { + reg = <0x0 0x808ff000 0x0 0x1000>; + no-map; + }; + + smem_mem: memory@80900000 { + reg = <0x0 0x80900000 0x0 0x200000>; + no-map; + }; + + tz_mem: memory@80b00000 { + reg = <0x0 0x80b00000 0x0 0x3900000>; + no-map; + }; + + ipa_fw_mem: memory@8b700000 { + reg = <0 0x8b700000 0 0x10000>; + no-map; + }; + + rmtfs_mem: memory@94600000 { + compatible = "qcom,rmtfs-mem"; + reg = <0x0 0x94600000 0x0 0x200000>; + no-map; + + qcom,client-id = <1>; + qcom,vmid = <15>; }; }; @@ -640,11 +645,6 @@ ipa_smp2p_in: ipa-modem-to-ap { }; }; - psci { - compatible = "arm,psci-1.0"; - method = "smc"; - }; - soc: soc@0 { #address-cells = <2>; #size-cells = <2>;