Skip to content

Commit 2fb251c

Browse files
bebarinoGeorgi Djakov
authored andcommitted
interconnect: qcom: sdx55: Drop IP0 interconnects
Similar to the sc7180 commit, let's drop the IP0 interconnects here because the IP0 resource is also used in the clk-rpmh driver on sdx55. It's bad to have the clk framework and interconnect framework control the same RPMh resource without any coordination. The rpmh driver in the kernel doesn't aggregate resources between clients either, so leaving control to clk-rpmh avoids any issues with unused interconnects turning off IP0 behind the back of the clk framework. Cc: Alex Elder <[email protected]> Cc: Manivannan Sadhasivam <[email protected]> Cc: Bjorn Andersson <[email protected]> Cc: Taniya Das <[email protected]> Cc: Mike Tipton <[email protected]> Fixes: b2150ca ("clk: qcom: rpmh: add support for SDX55 rpmh IPA clock") Signed-off-by: Stephen Boyd <[email protected]> Reviewed-by: Alex Elder <[email protected]> Acked-by: Manivannan Sadhasivam <[email protected]> Reviewed-by: Bjorn Andersson <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Georgi Djakov <[email protected]>
1 parent 2f37249 commit 2fb251c

File tree

1 file changed

+0
-21
lines changed

1 file changed

+0
-21
lines changed

drivers/interconnect/qcom/sdx55.c

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
#include "icc-rpmh.h"
1919
#include "sdx55.h"
2020

21-
DEFINE_QNODE(ipa_core_master, SDX55_MASTER_IPA_CORE, 1, 8, SDX55_SLAVE_IPA_CORE);
2221
DEFINE_QNODE(llcc_mc, SDX55_MASTER_LLCC, 4, 4, SDX55_SLAVE_EBI_CH0);
2322
DEFINE_QNODE(acm_tcu, SDX55_MASTER_TCU_0, 1, 8, SDX55_SLAVE_LLCC, SDX55_SLAVE_MEM_NOC_SNOC, SDX55_SLAVE_MEM_NOC_PCIE_SNOC);
2423
DEFINE_QNODE(qnm_snoc_gc, SDX55_MASTER_SNOC_GC_MEM_NOC, 1, 8, SDX55_SLAVE_LLCC);
@@ -40,7 +39,6 @@ DEFINE_QNODE(xm_pcie, SDX55_MASTER_PCIE, 1, 8, SDX55_SLAVE_ANOC_SNOC);
4039
DEFINE_QNODE(xm_qdss_etr, SDX55_MASTER_QDSS_ETR, 1, 8, SDX55_SLAVE_SNOC_CFG, SDX55_SLAVE_EMAC_CFG, SDX55_SLAVE_USB3, SDX55_SLAVE_AOSS, SDX55_SLAVE_SPMI_FETCHER, SDX55_SLAVE_QDSS_CFG, SDX55_SLAVE_PDM, SDX55_SLAVE_SNOC_MEM_NOC_GC, SDX55_SLAVE_TCSR, SDX55_SLAVE_CNOC_DDRSS, SDX55_SLAVE_SPMI_VGI_COEX, SDX55_SLAVE_QPIC, SDX55_SLAVE_OCIMEM, SDX55_SLAVE_IPA_CFG, SDX55_SLAVE_USB3_PHY_CFG, SDX55_SLAVE_AOP, SDX55_SLAVE_BLSP_1, SDX55_SLAVE_SDCC_1, SDX55_SLAVE_CNOC_MSS, SDX55_SLAVE_PCIE_PARF, SDX55_SLAVE_ECC_CFG, SDX55_SLAVE_AUDIO, SDX55_SLAVE_AOSS, SDX55_SLAVE_PRNG, SDX55_SLAVE_CRYPTO_0_CFG, SDX55_SLAVE_TCU, SDX55_SLAVE_CLK_CTL, SDX55_SLAVE_IMEM_CFG);
4140
DEFINE_QNODE(xm_sdc1, SDX55_MASTER_SDCC_1, 1, 8, SDX55_SLAVE_AOSS, SDX55_SLAVE_IPA_CFG, SDX55_SLAVE_ANOC_SNOC, SDX55_SLAVE_AOP, SDX55_SLAVE_AUDIO);
4241
DEFINE_QNODE(xm_usb3, SDX55_MASTER_USB3, 1, 8, SDX55_SLAVE_ANOC_SNOC);
43-
DEFINE_QNODE(ipa_core_slave, SDX55_SLAVE_IPA_CORE, 1, 8);
4442
DEFINE_QNODE(ebi, SDX55_SLAVE_EBI_CH0, 1, 4);
4543
DEFINE_QNODE(qns_llcc, SDX55_SLAVE_LLCC, 1, 16, SDX55_SLAVE_EBI_CH0);
4644
DEFINE_QNODE(qns_memnoc_snoc, SDX55_SLAVE_MEM_NOC_SNOC, 1, 8, SDX55_MASTER_MEM_NOC_SNOC);
@@ -82,7 +80,6 @@ DEFINE_QNODE(xs_sys_tcu_cfg, SDX55_SLAVE_TCU, 1, 8);
8280
DEFINE_QBCM(bcm_mc0, "MC0", true, &ebi);
8381
DEFINE_QBCM(bcm_sh0, "SH0", true, &qns_llcc);
8482
DEFINE_QBCM(bcm_ce0, "CE0", false, &qxm_crypto);
85-
DEFINE_QBCM(bcm_ip0, "IP0", false, &ipa_core_slave);
8683
DEFINE_QBCM(bcm_pn0, "PN0", false, &qhm_snoc_cfg);
8784
DEFINE_QBCM(bcm_sh3, "SH3", false, &xm_apps_rdwr);
8885
DEFINE_QBCM(bcm_sh4, "SH4", false, &qns_memnoc_snoc, &qns_sys_pcie);
@@ -219,31 +216,13 @@ static const struct qcom_icc_desc sdx55_system_noc = {
219216
.num_bcms = ARRAY_SIZE(system_noc_bcms),
220217
};
221218

222-
static struct qcom_icc_bcm *ipa_virt_bcms[] = {
223-
&bcm_ip0,
224-
};
225-
226-
static struct qcom_icc_node *ipa_virt_nodes[] = {
227-
[MASTER_IPA_CORE] = &ipa_core_master,
228-
[SLAVE_IPA_CORE] = &ipa_core_slave,
229-
};
230-
231-
static const struct qcom_icc_desc sdx55_ipa_virt = {
232-
.nodes = ipa_virt_nodes,
233-
.num_nodes = ARRAY_SIZE(ipa_virt_nodes),
234-
.bcms = ipa_virt_bcms,
235-
.num_bcms = ARRAY_SIZE(ipa_virt_bcms),
236-
};
237-
238219
static const struct of_device_id qnoc_of_match[] = {
239220
{ .compatible = "qcom,sdx55-mc-virt",
240221
.data = &sdx55_mc_virt},
241222
{ .compatible = "qcom,sdx55-mem-noc",
242223
.data = &sdx55_mem_noc},
243224
{ .compatible = "qcom,sdx55-system-noc",
244225
.data = &sdx55_system_noc},
245-
{ .compatible = "qcom,sdx55-ipa-virt",
246-
.data = &sdx55_ipa_virt},
247226
{ }
248227
};
249228
MODULE_DEVICE_TABLE(of, qnoc_of_match);

0 commit comments

Comments
 (0)