Skip to content

Commit cbabc73

Browse files
quic-kdybcioGeorgi Djakov
authored andcommitted
interconnect: qcom: qcs615: Drop IP0 interconnects
In the same spirit as e.g. Commit b136d25 ("interconnect: qcom: sc8280xp: Drop IP0 interconnects"), drop the resources that should be taken care of through the clk-rpmh driver. Fixes: 77d7967 ("interconnect: qcom: add QCS615 interconnect provider driver") Signed-off-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com> Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com> Link: https://lore.kernel.org/r/20250627-topic-qcs615_icc_ipa-v1-2-dc47596cde69@oss.qualcomm.com Signed-off-by: Georgi Djakov <djakov@kernel.org>
1 parent 7e0b594 commit cbabc73

1 file changed

Lines changed: 0 additions & 42 deletions

File tree

drivers/interconnect/qcom/qcs615.c

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -342,15 +342,6 @@ static struct qcom_icc_node qnm_snoc_sf = {
342342
.links = { QCS615_SLAVE_LLCC },
343343
};
344344

345-
static struct qcom_icc_node ipa_core_master = {
346-
.name = "ipa_core_master",
347-
.id = QCS615_MASTER_IPA_CORE,
348-
.channels = 1,
349-
.buswidth = 8,
350-
.num_links = 1,
351-
.links = { QCS615_SLAVE_IPA_CORE },
352-
};
353-
354345
static struct qcom_icc_node llcc_mc = {
355346
.name = "llcc_mc",
356347
.id = QCS615_MASTER_LLCC,
@@ -942,14 +933,6 @@ static struct qcom_icc_node srvc_gemnoc = {
942933
.num_links = 0,
943934
};
944935

945-
static struct qcom_icc_node ipa_core_slave = {
946-
.name = "ipa_core_slave",
947-
.id = QCS615_SLAVE_IPA_CORE,
948-
.channels = 1,
949-
.buswidth = 8,
950-
.num_links = 0,
951-
};
952-
953936
static struct qcom_icc_node ebi = {
954937
.name = "ebi",
955938
.id = QCS615_SLAVE_EBI1,
@@ -1113,12 +1096,6 @@ static struct qcom_icc_bcm bcm_cn1 = {
11131096
&qhs_sdc1, &qhs_sdc2 },
11141097
};
11151098

1116-
static struct qcom_icc_bcm bcm_ip0 = {
1117-
.name = "IP0",
1118-
.num_nodes = 1,
1119-
.nodes = { &ipa_core_slave },
1120-
};
1121-
11221099
static struct qcom_icc_bcm bcm_mc0 = {
11231100
.name = "MC0",
11241101
.keepalive = true,
@@ -1260,7 +1237,6 @@ static struct qcom_icc_bcm * const aggre1_noc_bcms[] = {
12601237
&bcm_qup0,
12611238
&bcm_sn3,
12621239
&bcm_sn14,
1263-
&bcm_ip0,
12641240
};
12651241

12661242
static struct qcom_icc_node * const aggre1_noc_nodes[] = {
@@ -1411,22 +1387,6 @@ static const struct qcom_icc_desc qcs615_gem_noc = {
14111387
.num_bcms = ARRAY_SIZE(gem_noc_bcms),
14121388
};
14131389

1414-
static struct qcom_icc_bcm * const ipa_virt_bcms[] = {
1415-
&bcm_ip0,
1416-
};
1417-
1418-
static struct qcom_icc_node * const ipa_virt_nodes[] = {
1419-
[MASTER_IPA_CORE] = &ipa_core_master,
1420-
[SLAVE_IPA_CORE] = &ipa_core_slave,
1421-
};
1422-
1423-
static const struct qcom_icc_desc qcs615_ipa_virt = {
1424-
.nodes = ipa_virt_nodes,
1425-
.num_nodes = ARRAY_SIZE(ipa_virt_nodes),
1426-
.bcms = ipa_virt_bcms,
1427-
.num_bcms = ARRAY_SIZE(ipa_virt_bcms),
1428-
};
1429-
14301390
static struct qcom_icc_bcm * const mc_virt_bcms[] = {
14311391
&bcm_acv,
14321392
&bcm_mc0,
@@ -1525,8 +1485,6 @@ static const struct of_device_id qnoc_of_match[] = {
15251485
.data = &qcs615_dc_noc},
15261486
{ .compatible = "qcom,qcs615-gem-noc",
15271487
.data = &qcs615_gem_noc},
1528-
{ .compatible = "qcom,qcs615-ipa-virt",
1529-
.data = &qcs615_ipa_virt},
15301488
{ .compatible = "qcom,qcs615-mc-virt",
15311489
.data = &qcs615_mc_virt},
15321490
{ .compatible = "qcom,qcs615-mmss-noc",

0 commit comments

Comments
 (0)