drop inteconnect patch

diff --git a/queue-6.15/interconnect-qcom-qcs615-drop-ip0-interconnects.patch b/queue-6.15/interconnect-qcom-qcs615-drop-ip0-interconnects.patch
deleted file mode 100644 (file)
index aee4f25..0000000
--- a/queue-6.15/interconnect-qcom-qcs615-drop-ip0-interconnects.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-From 099d294952be69e95803b8c09d2e1816a3faeaff Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 27 Jun 2025 21:37:56 +0200
-Subject: interconnect: qcom: qcs615: Drop IP0 interconnects
-
-From: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
-
-[ Upstream commit cbabc73e85be9e706a5051c9416de4a8d391cf57 ]
-
-In the same spirit as e.g. Commit b136d257ee0b ("interconnect: qcom:
-sc8280xp: Drop IP0 interconnects"), drop the resources that should be
-taken care of through the clk-rpmh driver.
-
-Fixes: 77d79677b04b ("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>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/interconnect/qcom/qcs615.c | 42 ------------------------------
- 1 file changed, 42 deletions(-)
-
-diff --git a/drivers/interconnect/qcom/qcs615.c b/drivers/interconnect/qcom/qcs615.c
-index 7e59e91ce886..0549cfcbac64 100644
---- a/drivers/interconnect/qcom/qcs615.c
-+++ b/drivers/interconnect/qcom/qcs615.c
-@@ -342,15 +342,6 @@ static struct qcom_icc_node qnm_snoc_sf = {
-       .links = { QCS615_SLAVE_LLCC },
- };
- 
--static struct qcom_icc_node ipa_core_master = {
--      .name = "ipa_core_master",
--      .id = QCS615_MASTER_IPA_CORE,
--      .channels = 1,
--      .buswidth = 8,
--      .num_links = 1,
--      .links = { QCS615_SLAVE_IPA_CORE },
--};
--
- static struct qcom_icc_node llcc_mc = {
-       .name = "llcc_mc",
-       .id = QCS615_MASTER_LLCC,
-@@ -942,14 +933,6 @@ static struct qcom_icc_node srvc_gemnoc = {
-       .num_links = 0,
- };
- 
--static struct qcom_icc_node ipa_core_slave = {
--      .name = "ipa_core_slave",
--      .id = QCS615_SLAVE_IPA_CORE,
--      .channels = 1,
--      .buswidth = 8,
--      .num_links = 0,
--};
--
- static struct qcom_icc_node ebi = {
-       .name = "ebi",
-       .id = QCS615_SLAVE_EBI1,
-@@ -1113,12 +1096,6 @@ static struct qcom_icc_bcm bcm_cn1 = {
-                  &qhs_sdc1, &qhs_sdc2 },
- };
- 
--static struct qcom_icc_bcm bcm_ip0 = {
--      .name = "IP0",
--      .num_nodes = 1,
--      .nodes = { &ipa_core_slave },
--};
--
- static struct qcom_icc_bcm bcm_mc0 = {
-       .name = "MC0",
-       .keepalive = true,
-@@ -1260,7 +1237,6 @@ static struct qcom_icc_bcm * const aggre1_noc_bcms[] = {
-       &bcm_qup0,
-       &bcm_sn3,
-       &bcm_sn14,
--      &bcm_ip0,
- };
- 
- static struct qcom_icc_node * const aggre1_noc_nodes[] = {
-@@ -1411,22 +1387,6 @@ static const struct qcom_icc_desc qcs615_gem_noc = {
-       .num_bcms = ARRAY_SIZE(gem_noc_bcms),
- };
- 
--static struct qcom_icc_bcm * const ipa_virt_bcms[] = {
--      &bcm_ip0,
--};
--
--static struct qcom_icc_node * const ipa_virt_nodes[] = {
--      [MASTER_IPA_CORE] = &ipa_core_master,
--      [SLAVE_IPA_CORE] = &ipa_core_slave,
--};
--
--static const struct qcom_icc_desc qcs615_ipa_virt = {
--      .nodes = ipa_virt_nodes,
--      .num_nodes = ARRAY_SIZE(ipa_virt_nodes),
--      .bcms = ipa_virt_bcms,
--      .num_bcms = ARRAY_SIZE(ipa_virt_bcms),
--};
--
- static struct qcom_icc_bcm * const mc_virt_bcms[] = {
-       &bcm_acv,
-       &bcm_mc0,
-@@ -1525,8 +1485,6 @@ static const struct of_device_id qnoc_of_match[] = {
-         .data = &qcs615_dc_noc},
-       { .compatible = "qcom,qcs615-gem-noc",
-         .data = &qcs615_gem_noc},
--      { .compatible = "qcom,qcs615-ipa-virt",
--        .data = &qcs615_ipa_virt},
-       { .compatible = "qcom,qcs615-mc-virt",
-         .data = &qcs615_mc_virt},
-       { .compatible = "qcom,qcs615-mmss-noc",
--- 
-2.39.5
-

diff --git a/queue-6.15/series b/queue-6.15/series
index 03097221b01e102002f33e2795bdfe2518edadc3..8af77a3b3187bab9289394d5b4c158d5eb347581 100644 (file)
--- a/queue-6.15/series
+++ b/queue-6.15/series
@@ -90,7 +90,6 @@ samples-mei-fix-building-on-musl-libc.patch
 soc-qcom-pmic_glink-fix-of-node-leak.patch
 interconnect-qcom-sc8280xp-specify-num_links-for-qnm.patch
 interconnect-qcom-sc8180x-specify-num_nodes.patch
-interconnect-qcom-qcs615-drop-ip0-interconnects.patch
 bus-mhi-host-pci_generic-fix-the-modem-name-of-foxco.patch
 drm-xe-correct-the-rev-value-for-the-dvsec-entries.patch
 drm-xe-correct-bmg-vsec-header-sizing.patch

diff --git a/queue-6.16/interconnect-qcom-qcs615-drop-ip0-interconnects.patch b/queue-6.16/interconnect-qcom-qcs615-drop-ip0-interconnects.patch
deleted file mode 100644 (file)
index 9f53280..0000000
--- a/queue-6.16/interconnect-qcom-qcs615-drop-ip0-interconnects.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-From 08002a0f074f6f612beca5ff685f4c5786dc98df Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 27 Jun 2025 21:37:56 +0200
-Subject: interconnect: qcom: qcs615: Drop IP0 interconnects
-
-From: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
-
-[ Upstream commit cbabc73e85be9e706a5051c9416de4a8d391cf57 ]
-
-In the same spirit as e.g. Commit b136d257ee0b ("interconnect: qcom:
-sc8280xp: Drop IP0 interconnects"), drop the resources that should be
-taken care of through the clk-rpmh driver.
-
-Fixes: 77d79677b04b ("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>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/interconnect/qcom/qcs615.c | 42 ------------------------------
- 1 file changed, 42 deletions(-)
-
-diff --git a/drivers/interconnect/qcom/qcs615.c b/drivers/interconnect/qcom/qcs615.c
-index 7e59e91ce886..0549cfcbac64 100644
---- a/drivers/interconnect/qcom/qcs615.c
-+++ b/drivers/interconnect/qcom/qcs615.c
-@@ -342,15 +342,6 @@ static struct qcom_icc_node qnm_snoc_sf = {
-       .links = { QCS615_SLAVE_LLCC },
- };
- 
--static struct qcom_icc_node ipa_core_master = {
--      .name = "ipa_core_master",
--      .id = QCS615_MASTER_IPA_CORE,
--      .channels = 1,
--      .buswidth = 8,
--      .num_links = 1,
--      .links = { QCS615_SLAVE_IPA_CORE },
--};
--
- static struct qcom_icc_node llcc_mc = {
-       .name = "llcc_mc",
-       .id = QCS615_MASTER_LLCC,
-@@ -942,14 +933,6 @@ static struct qcom_icc_node srvc_gemnoc = {
-       .num_links = 0,
- };
- 
--static struct qcom_icc_node ipa_core_slave = {
--      .name = "ipa_core_slave",
--      .id = QCS615_SLAVE_IPA_CORE,
--      .channels = 1,
--      .buswidth = 8,
--      .num_links = 0,
--};
--
- static struct qcom_icc_node ebi = {
-       .name = "ebi",
-       .id = QCS615_SLAVE_EBI1,
-@@ -1113,12 +1096,6 @@ static struct qcom_icc_bcm bcm_cn1 = {
-                  &qhs_sdc1, &qhs_sdc2 },
- };
- 
--static struct qcom_icc_bcm bcm_ip0 = {
--      .name = "IP0",
--      .num_nodes = 1,
--      .nodes = { &ipa_core_slave },
--};
--
- static struct qcom_icc_bcm bcm_mc0 = {
-       .name = "MC0",
-       .keepalive = true,
-@@ -1260,7 +1237,6 @@ static struct qcom_icc_bcm * const aggre1_noc_bcms[] = {
-       &bcm_qup0,
-       &bcm_sn3,
-       &bcm_sn14,
--      &bcm_ip0,
- };
- 
- static struct qcom_icc_node * const aggre1_noc_nodes[] = {
-@@ -1411,22 +1387,6 @@ static const struct qcom_icc_desc qcs615_gem_noc = {
-       .num_bcms = ARRAY_SIZE(gem_noc_bcms),
- };
- 
--static struct qcom_icc_bcm * const ipa_virt_bcms[] = {
--      &bcm_ip0,
--};
--
--static struct qcom_icc_node * const ipa_virt_nodes[] = {
--      [MASTER_IPA_CORE] = &ipa_core_master,
--      [SLAVE_IPA_CORE] = &ipa_core_slave,
--};
--
--static const struct qcom_icc_desc qcs615_ipa_virt = {
--      .nodes = ipa_virt_nodes,
--      .num_nodes = ARRAY_SIZE(ipa_virt_nodes),
--      .bcms = ipa_virt_bcms,
--      .num_bcms = ARRAY_SIZE(ipa_virt_bcms),
--};
--
- static struct qcom_icc_bcm * const mc_virt_bcms[] = {
-       &bcm_acv,
-       &bcm_mc0,
-@@ -1525,8 +1485,6 @@ static const struct of_device_id qnoc_of_match[] = {
-         .data = &qcs615_dc_noc},
-       { .compatible = "qcom,qcs615-gem-noc",
-         .data = &qcs615_gem_noc},
--      { .compatible = "qcom,qcs615-ipa-virt",
--        .data = &qcs615_ipa_virt},
-       { .compatible = "qcom,qcs615-mc-virt",
-         .data = &qcs615_mc_virt},
-       { .compatible = "qcom,qcs615-mmss-noc",
--- 
-2.39.5
-

diff --git a/queue-6.16/series b/queue-6.16/series
index 186009bc1ba2a610fb8a1c61f4851c5269e131ea..0f287312f59e0e006b7469794143d0142cc30e16 100644 (file)
--- a/queue-6.16/series
+++ b/queue-6.16/series
@@ -117,7 +117,6 @@ samples-mei-fix-building-on-musl-libc.patch
 soc-qcom-pmic_glink-fix-of-node-leak.patch
 interconnect-qcom-sc8280xp-specify-num_links-for-qnm.patch
 interconnect-qcom-sc8180x-specify-num_nodes.patch
-interconnect-qcom-qcs615-drop-ip0-interconnects.patch
 bus-mhi-host-pci_generic-fix-the-modem-name-of-foxco.patch
 drm-xe-correct-the-rev-value-for-the-dvsec-entries.patch
 drm-xe-correct-bmg-vsec-header-sizing.patch