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>
Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org
Subject: [RESEND v2 6/8] arm64: dts: qcom: sdm630: use defined symbols for interconnects
Date: Fri, 13 May 2022 02:43:47 +0300 [thread overview]
Message-ID: <20220512234349.2673724-7-dmitry.baryshkov@linaro.org> (raw)
In-Reply-To: <20220512234349.2673724-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 17a1877587cf..01a1a1703568 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 = <&gnoc 1 &bimc 5>;
+ interconnects = <&gnoc MASTER_APSS_PROC &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-12 23:44 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-12 23:43 [RESEND v2 0/8] arm64: dts: qcom: initial Inforce IFC6560 board support Dmitry Baryshkov
2022-05-12 23:43 ` [RESEND v2 1/8] arm64: dts: qcom: sdm660: disable dsi1/dsi1_phy by default Dmitry Baryshkov
2022-05-12 23:43 ` [RESEND v2 2/8] arm64: dts: qcom: sdm630: " Dmitry Baryshkov
2022-05-12 23:43 ` [RESEND v2 3/8] arm64: dts: qcom: sdm630: disable GPU " Dmitry Baryshkov
2022-05-12 23:43 ` [RESEND v2 4/8] arm64: dts: qcom: sdm630: fix the qusb2phy ref clock Dmitry Baryshkov
2022-05-12 23:43 ` [RESEND v2 5/8] arm64: dts: qcom: sdm630: add second (HS) USB host support Dmitry Baryshkov
2022-05-12 23:43 ` Dmitry Baryshkov [this message]
2022-05-12 23:43 ` [RESEND v2 7/8] arm64: dts: qcom: sdm660: Add initial Inforce IFC6560 board support Dmitry Baryshkov
2022-05-12 23:43 ` [RESEND v2 8/8] dt-bindings: arm: qcom: document sda660 SoC and ifc6560 board Dmitry Baryshkov
2022-05-13 7:04 ` Krzysztof Kozlowski
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=20220512234349.2673724-7-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=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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.