From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
To: Andy Gross <agross@kernel.org>,
Bjorn Andersson <bjorn.andersson@linaro.org>,
Rob Herring <robh+dt@kernel.org>,
Krzysztof Kozlowski <krzk@kernel.org>,
Konrad Dybcio <konrad.dybcio@somainline.org>,
Marijn Suijten <marijn.suijten@somainline.org>
Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org
Subject: [PATCH v4 08/12] arm64: dts: qcom: sdm630: use defined symbols for interconnects
Date: Sat, 14 May 2022 17:10:37 +0300 [thread overview]
Message-ID: <20220514141041.3158521-9-dmitry.baryshkov@linaro.org> (raw)
In-Reply-To: <20220514141041.3158521-1-dmitry.baryshkov@linaro.org>
Replace numeric values with the symbolic names defined in the bindings
header.
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
arch/arm64/boot/dts/qcom/sdm630.dtsi | 23 ++++++++++++-----------
1 file changed, 12 insertions(+), 11 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/sdm630.dtsi b/arch/arm64/boot/dts/qcom/sdm630.dtsi
index 6d0bc9e8fb5b..44f048934fc6 100644
--- a/arch/arm64/boot/dts/qcom/sdm630.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm630.dtsi
@@ -8,6 +8,7 @@
#include <dt-bindings/clock/qcom,gpucc-sdm660.h>
#include <dt-bindings/clock/qcom,mmcc-sdm660.h>
#include <dt-bindings/clock/qcom,rpmcc.h>
+#include <dt-bindings/interconnect/qcom,sdm660.h>
#include <dt-bindings/power/qcom-rpmpd.h>
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/interrupt-controller/arm-gic.h>
@@ -1045,7 +1046,7 @@ adreno_gpu: gpu@5000000 {
nvmem-cells = <&gpu_speed_bin>;
nvmem-cell-names = "speed_bin";
- interconnects = <&bimc 1 &bimc 5>;
+ interconnects = <&bimc MASTER_OXILI &bimc SLAVE_EBI>;
interconnect-names = "gfx-mem";
operating-points-v2 = <&gpu_sdm630_opp_table>;
@@ -1299,8 +1300,8 @@ sdhc_2: sdhci@c084000 {
<&xo_board>;
clock-names = "core", "iface", "xo";
- interconnects = <&a2noc 3 &a2noc 10>,
- <&gnoc 0 &cnoc 28>;
+ interconnects = <&a2noc MASTER_SDCC_2 &a2noc SLAVE_A2NOC_SNOC>,
+ <&gnoc MASTER_APSS_PROC &cnoc SLAVE_SDCC_2>;
operating-points-v2 = <&sdhc2_opp_table>;
pinctrl-names = "default", "sleep";
@@ -1351,8 +1352,8 @@ sdhc_1: sdhci@c0c4000 {
<&gcc GCC_SDCC1_ICE_CORE_CLK>;
clock-names = "core", "iface", "xo", "ice";
- interconnects = <&a2noc 2 &a2noc 10>,
- <&gnoc 0 &cnoc 27>;
+ interconnects = <&a2noc MASTER_SDCC_1 &a2noc SLAVE_A2NOC_SNOC>,
+ <&gnoc MASTER_APSS_PROC &cnoc SLAVE_SDCC_1>;
interconnect-names = "sdhc1-ddr", "cpu-sdhc1";
operating-points-v2 = <&sdhc1_opp_table>;
pinctrl-names = "default", "sleep";
@@ -1525,9 +1526,9 @@ mdp: mdp@c901000 {
"core",
"vsync";
- interconnects = <&mnoc 2 &bimc 5>,
- <&mnoc 3 &bimc 5>,
- <&gnoc 0 &mnoc 17>;
+ interconnects = <&mnoc MASTER_MDP_P0 &bimc SLAVE_EBI>,
+ <&mnoc MASTER_MDP_P1 &bimc SLAVE_EBI>,
+ <&gnoc MASTER_APSS_PROC &mnoc SLAVE_DISPLAY_CFG>;
interconnect-names = "mdp0-mem",
"mdp1-mem",
"rotator-mem";
@@ -2034,7 +2035,7 @@ camss: camss@ca00000 {
"cphy_csid1",
"cphy_csid2",
"cphy_csid3";
- interconnects = <&mnoc 5 &bimc 5>;
+ interconnects = <&mnoc MASTER_VFE &bimc SLAVE_EBI>;
interconnect-names = "vfe-mem";
iommus = <&mmss_smmu 0xc00>,
<&mmss_smmu 0xc01>,
@@ -2097,8 +2098,8 @@ venus: video-codec@cc00000 {
<&mmcc VIDEO_AXI_CLK>,
<&mmcc THROTTLE_VIDEO_AXI_CLK>;
clock-names = "core", "iface", "bus", "bus_throttle";
- interconnects = <&gnoc 0 &mnoc 13>,
- <&mnoc 4 &bimc 5>;
+ interconnects = <&gnoc MASTER_APSS_PROC &mnoc SLAVE_VENUS_CFG>,
+ <&mnoc MASTER_VENUS &bimc SLAVE_EBI>;
interconnect-names = "cpu-cfg", "video-mem";
interrupts = <GIC_SPI 287 IRQ_TYPE_LEVEL_HIGH>;
iommus = <&mmss_smmu 0x400>,
--
2.35.1
next prev parent reply other threads:[~2022-05-14 14:11 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-14 14:10 [PATCH v4 00/12] arm64: dts: qcom: initial Inforce IFC6560 board support Dmitry Baryshkov
2022-05-14 14:10 ` [PATCH v4 01/12] arm64: dts: qcom: sdm630: disable dsi0/dsi0_phy by default Dmitry Baryshkov
2022-05-14 14:44 ` Konrad Dybcio
2022-05-14 14:10 ` [PATCH v4 02/12] arm64: dts: qcom: sdm660: disable dsi1/dsi1_phy " Dmitry Baryshkov
2022-05-14 14:44 ` Konrad Dybcio
2022-05-14 14:45 ` Konrad Dybcio
2022-05-14 14:10 ` [PATCH v4 03/12] arm64: dts: qcom: sdm630: disable GPU " Dmitry Baryshkov
2022-05-14 14:10 ` [PATCH v4 04/12] arm64: dts: qcom: sdm630: fix the qusb2phy ref clock Dmitry Baryshkov
2022-05-14 14:10 ` [PATCH v4 05/12] arm64: dts: qcom: sdm630: rename qusb2phy to qusb2phy0 Dmitry Baryshkov
2022-05-14 14:46 ` Konrad Dybcio
2022-05-14 14:10 ` [PATCH v4 06/12] arm64: dts: qcom: sdm630: add second (HS) USB host support Dmitry Baryshkov
2022-05-14 14:10 ` [PATCH v4 07/12] arm64: dts: qcom: sdm630: fix gpu's interconnect path Dmitry Baryshkov
2022-05-14 14:10 ` Dmitry Baryshkov [this message]
2022-05-14 14:10 ` [PATCH v4 09/12] arm64: dts: qcom: sdm636-sony-xperia-ganges-mermaid: correct sdc2 pinconf Dmitry Baryshkov
2022-05-14 14:50 ` Konrad Dybcio
2022-05-14 14:10 ` [PATCH v4 10/12] arm64: dts: qcom: sdm660: move SDHC2 card detect pinconf to board files Dmitry Baryshkov
2022-05-14 14:10 ` [PATCH v4 11/12] arm64: dts: qcom: sdm660: Add initial Inforce IFC6560 board support Dmitry Baryshkov
2022-05-14 14:43 ` Konrad Dybcio
2022-05-14 18:51 ` Dmitry Baryshkov
2022-05-14 19:44 ` Konrad Dybcio
2022-05-14 14:10 ` [PATCH v4 12/12] dt-bindings: arm: qcom: document sda660 SoC and ifc6560 board Dmitry Baryshkov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220514141041.3158521-9-dmitry.baryshkov@linaro.org \
--to=dmitry.baryshkov@linaro.org \
--cc=agross@kernel.org \
--cc=bjorn.andersson@linaro.org \
--cc=devicetree@vger.kernel.org \
--cc=konrad.dybcio@somainline.org \
--cc=krzk@kernel.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=marijn.suijten@somainline.org \
--cc=robh+dt@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).