Skip to content

L
linux
Commit 7901c2bc authored by Georgi Djakov's avatar Georgi Djakov Committed by Bjorn Andersson
Browse files
Options

arm64: dts: qcom: sdm845: Increase the number of interconnect cells 

Increase the number of interconnect-cells, as now we can include
the tag information. The consumers can specify the path tag as an
additional argument to the endpoints.
Tested-by: default avatarSibi Sankar <sibis@codeaurora.org>
Reviewed-by: default avatarSibi Sankar <sibis@codeaurora.org>
Reviewed-by: default avatarMatthias Kaehlcke <mka@chromium.org>
Signed-off-by: default avatarGeorgi Djakov <georgi.djakov@linaro.org>
Link: https://lore.kernel.org/r/20200903133134.17201-6-georgi.djakov@linaro.orgSigned-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
parent a9118250
Show whitespace changes
Inline Side-by-side
Showing with 24 additions and 24 deletions
arch/arm64/boot/dts/qcom/sdm845.dtsi
View file @ 7901c2bc
...@@ -200,7 +200,7 @@ &LITTLE_CPU_SLEEP_1 ...@@ -200,7 +200,7 @@ &LITTLE_CPU_SLEEP_1
dynamic-power-coefficient = <100>; dynamic-power-coefficient = <100>;
qcom,freq-domain = <&cpufreq_hw 0>; qcom,freq-domain = <&cpufreq_hw 0>;
operating-points-v2 = <&cpu0_opp_table>; operating-points-v2 = <&cpu0_opp_table>;
interconnects = <&gladiator_noc MASTER_APPSS_PROC &mem_noc SLAVE_EBI1>, interconnects = <&gladiator_noc MASTER_APPSS_PROC 3 &mem_noc SLAVE_EBI1 3>,
<&osm_l3 MASTER_OSM_L3_APPS &osm_l3 SLAVE_OSM_L3>; <&osm_l3 MASTER_OSM_L3_APPS &osm_l3 SLAVE_OSM_L3>;
#cooling-cells = <2>; #cooling-cells = <2>;
next-level-cache = <&L2_0>; next-level-cache = <&L2_0>;
...@@ -225,7 +225,7 @@ &LITTLE_CPU_SLEEP_1 ...@@ -225,7 +225,7 @@ &LITTLE_CPU_SLEEP_1
dynamic-power-coefficient = <100>; dynamic-power-coefficient = <100>;
qcom,freq-domain = <&cpufreq_hw 0>; qcom,freq-domain = <&cpufreq_hw 0>;
operating-points-v2 = <&cpu0_opp_table>; operating-points-v2 = <&cpu0_opp_table>;
interconnects = <&gladiator_noc MASTER_APPSS_PROC &mem_noc SLAVE_EBI1>, interconnects = <&gladiator_noc MASTER_APPSS_PROC 3 &mem_noc SLAVE_EBI1 3>,
<&osm_l3 MASTER_OSM_L3_APPS &osm_l3 SLAVE_OSM_L3>; <&osm_l3 MASTER_OSM_L3_APPS &osm_l3 SLAVE_OSM_L3>;
#cooling-cells = <2>; #cooling-cells = <2>;
next-level-cache = <&L2_100>; next-level-cache = <&L2_100>;
...@@ -247,7 +247,7 @@ &LITTLE_CPU_SLEEP_1 ...@@ -247,7 +247,7 @@ &LITTLE_CPU_SLEEP_1
dynamic-power-coefficient = <100>; dynamic-power-coefficient = <100>;
qcom,freq-domain = <&cpufreq_hw 0>; qcom,freq-domain = <&cpufreq_hw 0>;
operating-points-v2 = <&cpu0_opp_table>; operating-points-v2 = <&cpu0_opp_table>;
interconnects = <&gladiator_noc MASTER_APPSS_PROC &mem_noc SLAVE_EBI1>, interconnects = <&gladiator_noc MASTER_APPSS_PROC 3 &mem_noc SLAVE_EBI1 3>,
<&osm_l3 MASTER_OSM_L3_APPS &osm_l3 SLAVE_OSM_L3>; <&osm_l3 MASTER_OSM_L3_APPS &osm_l3 SLAVE_OSM_L3>;
#cooling-cells = <2>; #cooling-cells = <2>;
next-level-cache = <&L2_200>; next-level-cache = <&L2_200>;
...@@ -269,7 +269,7 @@ &LITTLE_CPU_SLEEP_1 ...@@ -269,7 +269,7 @@ &LITTLE_CPU_SLEEP_1
dynamic-power-coefficient = <100>; dynamic-power-coefficient = <100>;
qcom,freq-domain = <&cpufreq_hw 0>; qcom,freq-domain = <&cpufreq_hw 0>;
operating-points-v2 = <&cpu0_opp_table>; operating-points-v2 = <&cpu0_opp_table>;
interconnects = <&gladiator_noc MASTER_APPSS_PROC &mem_noc SLAVE_EBI1>, interconnects = <&gladiator_noc MASTER_APPSS_PROC 3 &mem_noc SLAVE_EBI1 3>,
<&osm_l3 MASTER_OSM_L3_APPS &osm_l3 SLAVE_OSM_L3>; <&osm_l3 MASTER_OSM_L3_APPS &osm_l3 SLAVE_OSM_L3>;
#cooling-cells = <2>; #cooling-cells = <2>;
next-level-cache = <&L2_300>; next-level-cache = <&L2_300>;
...@@ -291,7 +291,7 @@ &BIG_CPU_SLEEP_1 ...@@ -291,7 +291,7 @@ &BIG_CPU_SLEEP_1
dynamic-power-coefficient = <396>; dynamic-power-coefficient = <396>;
qcom,freq-domain = <&cpufreq_hw 1>; qcom,freq-domain = <&cpufreq_hw 1>;
operating-points-v2 = <&cpu4_opp_table>; operating-points-v2 = <&cpu4_opp_table>;
interconnects = <&gladiator_noc MASTER_APPSS_PROC &mem_noc SLAVE_EBI1>, interconnects = <&gladiator_noc MASTER_APPSS_PROC 3 &mem_noc SLAVE_EBI1 3>,
<&osm_l3 MASTER_OSM_L3_APPS &osm_l3 SLAVE_OSM_L3>; <&osm_l3 MASTER_OSM_L3_APPS &osm_l3 SLAVE_OSM_L3>;
#cooling-cells = <2>; #cooling-cells = <2>;
next-level-cache = <&L2_400>; next-level-cache = <&L2_400>;
...@@ -313,7 +313,7 @@ &BIG_CPU_SLEEP_1 ...@@ -313,7 +313,7 @@ &BIG_CPU_SLEEP_1
dynamic-power-coefficient = <396>; dynamic-power-coefficient = <396>;
qcom,freq-domain = <&cpufreq_hw 1>; qcom,freq-domain = <&cpufreq_hw 1>;
operating-points-v2 = <&cpu4_opp_table>; operating-points-v2 = <&cpu4_opp_table>;
interconnects = <&gladiator_noc MASTER_APPSS_PROC &mem_noc SLAVE_EBI1>, interconnects = <&gladiator_noc MASTER_APPSS_PROC 3 &mem_noc SLAVE_EBI1 3>,
<&osm_l3 MASTER_OSM_L3_APPS &osm_l3 SLAVE_OSM_L3>; <&osm_l3 MASTER_OSM_L3_APPS &osm_l3 SLAVE_OSM_L3>;
#cooling-cells = <2>; #cooling-cells = <2>;
next-level-cache = <&L2_500>; next-level-cache = <&L2_500>;
...@@ -335,7 +335,7 @@ &BIG_CPU_SLEEP_1 ...@@ -335,7 +335,7 @@ &BIG_CPU_SLEEP_1
dynamic-power-coefficient = <396>; dynamic-power-coefficient = <396>;
qcom,freq-domain = <&cpufreq_hw 1>; qcom,freq-domain = <&cpufreq_hw 1>;
operating-points-v2 = <&cpu4_opp_table>; operating-points-v2 = <&cpu4_opp_table>;
interconnects = <&gladiator_noc MASTER_APPSS_PROC &mem_noc SLAVE_EBI1>, interconnects = <&gladiator_noc MASTER_APPSS_PROC 3 &mem_noc SLAVE_EBI1 3>,
<&osm_l3 MASTER_OSM_L3_APPS &osm_l3 SLAVE_OSM_L3>; <&osm_l3 MASTER_OSM_L3_APPS &osm_l3 SLAVE_OSM_L3>;
#cooling-cells = <2>; #cooling-cells = <2>;
next-level-cache = <&L2_600>; next-level-cache = <&L2_600>;
...@@ -357,7 +357,7 @@ &BIG_CPU_SLEEP_1 ...@@ -357,7 +357,7 @@ &BIG_CPU_SLEEP_1
dynamic-power-coefficient = <396>; dynamic-power-coefficient = <396>;
qcom,freq-domain = <&cpufreq_hw 1>; qcom,freq-domain = <&cpufreq_hw 1>;
operating-points-v2 = <&cpu4_opp_table>; operating-points-v2 = <&cpu4_opp_table>;
interconnects = <&gladiator_noc MASTER_APPSS_PROC &mem_noc SLAVE_EBI1>, interconnects = <&gladiator_noc MASTER_APPSS_PROC 3 &mem_noc SLAVE_EBI1 3>,
<&osm_l3 MASTER_OSM_L3_APPS &osm_l3 SLAVE_OSM_L3>; <&osm_l3 MASTER_OSM_L3_APPS &osm_l3 SLAVE_OSM_L3>;
#cooling-cells = <2>; #cooling-cells = <2>;
next-level-cache = <&L2_700>; next-level-cache = <&L2_700>;
...@@ -2011,49 +2011,49 @@ pcie1_lane: lanes@1c06200 { ...@@ -2011,49 +2011,49 @@ pcie1_lane: lanes@1c06200 {
mem_noc: interconnect@1380000 { mem_noc: interconnect@1380000 {
compatible = "qcom,sdm845-mem-noc"; compatible = "qcom,sdm845-mem-noc";
reg = <0 0x01380000 0 0x27200>; reg = <0 0x01380000 0 0x27200>;
#interconnect-cells = <1>; #interconnect-cells = <2>;
qcom,bcm-voters = <&apps_bcm_voter>; qcom,bcm-voters = <&apps_bcm_voter>;
}; };
dc_noc: interconnect@14e0000 { dc_noc: interconnect@14e0000 {
compatible = "qcom,sdm845-dc-noc"; compatible = "qcom,sdm845-dc-noc";
reg = <0 0x014e0000 0 0x400>; reg = <0 0x014e0000 0 0x400>;
#interconnect-cells = <1>; #interconnect-cells = <2>;
qcom,bcm-voters = <&apps_bcm_voter>; qcom,bcm-voters = <&apps_bcm_voter>;
}; };
config_noc: interconnect@1500000 { config_noc: interconnect@1500000 {
compatible = "qcom,sdm845-config-noc"; compatible = "qcom,sdm845-config-noc";
reg = <0 0x01500000 0 0x5080>; reg = <0 0x01500000 0 0x5080>;
#interconnect-cells = <1>; #interconnect-cells = <2>;
qcom,bcm-voters = <&apps_bcm_voter>; qcom,bcm-voters = <&apps_bcm_voter>;
}; };
system_noc: interconnect@1620000 { system_noc: interconnect@1620000 {
compatible = "qcom,sdm845-system-noc"; compatible = "qcom,sdm845-system-noc";
reg = <0 0x01620000 0 0x18080>; reg = <0 0x01620000 0 0x18080>;
#interconnect-cells = <1>; #interconnect-cells = <2>;
qcom,bcm-voters = <&apps_bcm_voter>; qcom,bcm-voters = <&apps_bcm_voter>;
}; };
aggre1_noc: interconnect@16e0000 { aggre1_noc: interconnect@16e0000 {
compatible = "qcom,sdm845-aggre1-noc"; compatible = "qcom,sdm845-aggre1-noc";
reg = <0 0x016e0000 0 0x15080>; reg = <0 0x016e0000 0 0x15080>;
#interconnect-cells = <1>; #interconnect-cells = <2>;
qcom,bcm-voters = <&apps_bcm_voter>; qcom,bcm-voters = <&apps_bcm_voter>;
}; };
aggre2_noc: interconnect@1700000 { aggre2_noc: interconnect@1700000 {
compatible = "qcom,sdm845-aggre2-noc"; compatible = "qcom,sdm845-aggre2-noc";
reg = <0 0x01700000 0 0x1f300>; reg = <0 0x01700000 0 0x1f300>;
#interconnect-cells = <1>; #interconnect-cells = <2>;
qcom,bcm-voters = <&apps_bcm_voter>; qcom,bcm-voters = <&apps_bcm_voter>;
}; };
mmss_noc: interconnect@1740000 { mmss_noc: interconnect@1740000 {
compatible = "qcom,sdm845-mmss-noc"; compatible = "qcom,sdm845-mmss-noc";
reg = <0 0x01740000 0 0x1c100>; reg = <0 0x01740000 0 0x1c100>;
#interconnect-cells = <1>; #interconnect-cells = <2>;
qcom,bcm-voters = <&apps_bcm_voter>; qcom,bcm-voters = <&apps_bcm_voter>;
}; };
...@@ -2156,9 +2156,9 @@ ipa: ipa@1e40000 { ...@@ -2156,9 +2156,9 @@ ipa: ipa@1e40000 {
clocks = <&rpmhcc RPMH_IPA_CLK>; clocks = <&rpmhcc RPMH_IPA_CLK>;
clock-names = "core"; clock-names = "core";
interconnects = <&aggre2_noc MASTER_IPA &mem_noc SLAVE_EBI1>, interconnects = <&aggre2_noc MASTER_IPA 0 &mem_noc SLAVE_EBI1 0>,
<&aggre2_noc MASTER_IPA &system_noc SLAVE_IMEM>, <&aggre2_noc MASTER_IPA 0 &system_noc SLAVE_IMEM 0>,
<&gladiator_noc MASTER_APPSS_PROC &config_noc SLAVE_IPA_CFG>; <&gladiator_noc MASTER_APPSS_PROC 0 &config_noc SLAVE_IPA_CFG 0>;
interconnect-names = "memory", interconnect-names = "memory",
"imem", "imem",
"config"; "config";
...@@ -3569,8 +3569,8 @@ usb_1: usb@a6f8800 { ...@@ -3569,8 +3569,8 @@ usb_1: usb@a6f8800 {
resets = <&gcc GCC_USB30_PRIM_BCR>; resets = <&gcc GCC_USB30_PRIM_BCR>;
interconnects = <&aggre2_noc MASTER_USB3_0 &mem_noc SLAVE_EBI1>, interconnects = <&aggre2_noc MASTER_USB3_0 0 &mem_noc SLAVE_EBI1 0>,
<&gladiator_noc MASTER_APPSS_PROC &config_noc SLAVE_USB3_0>; <&gladiator_noc MASTER_APPSS_PROC 0 &config_noc SLAVE_USB3_0 0>;
interconnect-names = "usb-ddr", "apps-usb"; interconnect-names = "usb-ddr", "apps-usb";
usb_1_dwc3: dwc3@a600000 { usb_1_dwc3: dwc3@a600000 {
...@@ -3617,8 +3617,8 @@ usb_2: usb@a8f8800 { ...@@ -3617,8 +3617,8 @@ usb_2: usb@a8f8800 {
resets = <&gcc GCC_USB30_SEC_BCR>; resets = <&gcc GCC_USB30_SEC_BCR>;
interconnects = <&aggre2_noc MASTER_USB3_1 &mem_noc SLAVE_EBI1>, interconnects = <&aggre2_noc MASTER_USB3_1 0 &mem_noc SLAVE_EBI1 0>,
<&gladiator_noc MASTER_APPSS_PROC &config_noc SLAVE_USB3_1>; <&gladiator_noc MASTER_APPSS_PROC 0 &config_noc SLAVE_USB3_1 0>;
interconnect-names = "usb-ddr", "apps-usb"; interconnect-names = "usb-ddr", "apps-usb";
usb_2_dwc3: dwc3@a800000 { usb_2_dwc3: dwc3@a800000 {
...@@ -4043,7 +4043,7 @@ gpu: gpu@5000000 { ...@@ -4043,7 +4043,7 @@ gpu: gpu@5000000 {
qcom,gmu = <&gmu>; qcom,gmu = <&gmu>;
interconnects = <&mem_noc MASTER_GFX3D &mem_noc SLAVE_EBI1>; interconnects = <&mem_noc MASTER_GFX3D 0 &mem_noc SLAVE_EBI1 0>;
interconnect-names = "gfx-mem"; interconnect-names = "gfx-mem";
gpu_opp_table: opp-table { gpu_opp_table: opp-table {
...@@ -4360,7 +4360,7 @@ lpasscc: clock-controller@17014000 { ...@@ -4360,7 +4360,7 @@ lpasscc: clock-controller@17014000 {
gladiator_noc: interconnect@17900000 { gladiator_noc: interconnect@17900000 {
compatible = "qcom,sdm845-gladiator-noc"; compatible = "qcom,sdm845-gladiator-noc";
reg = <0 0x17900000 0 0xd080>; reg = <0 0x17900000 0 0xd080>;
#interconnect-cells = <1>; #interconnect-cells = <2>;
qcom,bcm-voters = <&apps_bcm_voter>; qcom,bcm-voters = <&apps_bcm_voter>;
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7