github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-27 17:47:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Merge branch 'icc-eliza' into icc-next

Browse Source 
Add the missing Eliza SDCC1 interconnect slave ID and provider node.

The Eliza interconnect binding and provider already describe SDCC2, but
the matching SDCC1 CNOC CFG slave was left out. Add the binding constant
and the provider node so consumers can describe SDCC1 bandwidth paths.

The provider change also adds qhs_sdc1 to qsm_cfg and bcm_cn0, and updates
the qsm_cfg link count and bcm_cn0 node count.

* icc-eliza
  dt-bindings: interconnect: qcom,eliza-rpmh: Add SDCC1 slave
  interconnect: qcom: eliza: Add SDCC1 slave node

Link: https://patch.msgid.link/20260514-eliza-interconnect-add-missing-sdcc1-slave-node-v2-0-13c03bc890cb@oss.qualcomm.com
Signed-off-by: Georgi Djakov <djakov@kernel.org>
This commit is contained in:
Georgi Djakov 2026-05-21 20:58:17 +03:00
commit 67a4412db0
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/interconnect/qcom/eliza.c
View File

@ -127,6 +127,12 @@ static struct qcom_icc_node qhs_qup2 = {
.buswidth = 4,
};
static struct qcom_icc_node qhs_sdc1 = {
.name = "qhs_sdc1",
.channels = 1,
.buswidth = 4,
};
static struct qcom_icc_node qhs_sdc2 = {
.name = "qhs_sdc2",
.channels = 1,
@ -383,7 +389,7 @@ static struct qcom_icc_node qsm_cfg = {
.name = "qsm_cfg",
.channels = 1,
.buswidth = 4,
.num_links = 29,
.num_links = 30,
.link_nodes = { &qhs_ahb2phy0, &qhs_ahb2phy1,
&qhs_camera_cfg, &qhs_clk_ctl,
&qhs_crypto0_cfg, &qhs_display_cfg,
@ -392,7 +398,7 @@ static struct qcom_icc_node qsm_cfg = {
&qhs_mss_cfg, &qhs_pcie_0_cfg,
&qhs_prng, &qhs_qdss_cfg,
&qhs_qspi, &qhs_qup1,
&qhs_qup2, &qhs_sdc2,
&qhs_qup2, &qhs_sdc1, &qhs_sdc2,
&qhs_tcsr, &qhs_tlmm,
&qhs_ufs_mem_cfg, &qhs_usb3_0,
&qhs_venus_cfg, &qhs_vsense_ctrl_cfg,
@ -1111,7 +1117,7 @@ static struct qcom_icc_bcm bcm_cn0 = {
.name = "CN0",
.enable_mask = BIT(0),
.keepalive = true,
.num_nodes = 43,
.num_nodes = 44,
.nodes = { &qsm_cfg, &qhs_ahb2phy0,
&qhs_ahb2phy1, &qhs_camera_cfg,
&qhs_clk_ctl, &qhs_crypto0_cfg,
@ -1119,7 +1125,7 @@ static struct qcom_icc_bcm bcm_cn0 = {
&qhs_i3c_ibi1_cfg, &qhs_imem_cfg,
&qhs_mss_cfg, &qhs_pcie_0_cfg,
&qhs_prng, &qhs_qdss_cfg,
&qhs_qspi, &qhs_sdc2,
&qhs_qspi, &qhs_sdc1, &qhs_sdc2,
&qhs_tcsr, &qhs_tlmm,
&qhs_ufs_mem_cfg, &qhs_usb3_0,
&qhs_venus_cfg, &qhs_vsense_ctrl_cfg,
@ -1321,6 +1327,7 @@ static struct qcom_icc_node * const cnoc_cfg_nodes[] = {
[SLAVE_QSPI_0] = &qhs_qspi,
[SLAVE_QUP_1] = &qhs_qup1,
[SLAVE_QUP_2] = &qhs_qup2,
[SLAVE_SDCC_1] = &qhs_sdc1,
[SLAVE_SDCC_2] = &qhs_sdc2,
[SLAVE_TCSR] = &qhs_tcsr,
[SLAVE_TLMM] = &qhs_tlmm,

1
include/dt-bindings/interconnect/qcom,eliza-rpmh.h
View File

@ -57,6 +57,7 @@
#define SLAVE_PCIE_ANOC_CFG 27
#define SLAVE_QDSS_STM 28
#define SLAVE_TCU 29
#define SLAVE_SDCC_1 30
#define MASTER_GEM_NOC_CNOC 0
#define MASTER_GEM_NOC_PCIE_SNOC 1