To avoid confusion, explicitly assign the BCM voter index.
Note the assignment may be incorrect, but this commit brings no
functional change.
Signed-off-by: Konrad Dybcio <konrad.dybcio@xxxxxxxxxx>
---
drivers/interconnect/qcom/sm8550.c | 42 ++++++++++++++++++++++++++++++++++++++
1 file changed, 42 insertions(+)
diff --git a/drivers/interconnect/qcom/sm8550.c b/drivers/interconnect/qcom/sm8550.c
index 0864ed285375..40740cf5e41d 100644
--- a/drivers/interconnect/qcom/sm8550.c
+++ b/drivers/interconnect/qcom/sm8550.c
@@ -1474,12 +1474,14 @@ static struct qcom_icc_node qns_mem_noc_sf_cam_ife_2 = {
static struct qcom_icc_bcm bcm_acv = {
.name = "ACV",
.enable_mask = 0x8,
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 1,
.nodes = { &ebi },
};
static struct qcom_icc_bcm bcm_ce0 = {
.name = "CE0",
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 1,
.nodes = { &qxm_crypto },
};
@@ -1488,6 +1490,7 @@ static struct qcom_icc_bcm bcm_cn0 = {
.name = "CN0",
.enable_mask = 0x1,
.keepalive = true,
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 54,
.nodes = { &qsm_cfg, &qhs_ahb2phy0,
&qhs_ahb2phy1, &qhs_apss,
@@ -1520,6 +1523,7 @@ static struct qcom_icc_bcm bcm_cn0 = {
static struct qcom_icc_bcm bcm_cn1 = {
.name = "CN1",
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 1,
.nodes = { &qhs_display_cfg },
};
@@ -1527,12 +1531,14 @@ static struct qcom_icc_bcm bcm_cn1 = {
static struct qcom_icc_bcm bcm_co0 = {
.name = "CO0",
.enable_mask = 0x1,
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 2,
.nodes = { &qxm_nsp, &qns_nsp_gemnoc },
};
static struct qcom_icc_bcm bcm_lp0 = {
.name = "LP0",
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 2,
.nodes = { &qnm_lpass_lpinoc, &qns_lpass_aggnoc },
};
@@ -1540,12 +1546,14 @@ static struct qcom_icc_bcm bcm_lp0 = {
static struct qcom_icc_bcm bcm_mc0 = {
.name = "MC0",
.keepalive = true,
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 1,
.nodes = { &ebi },
};
static struct qcom_icc_bcm bcm_mm0 = {
.name = "MM0",
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 1,
.nodes = { &qns_mem_noc_hf },
};
@@ -1553,6 +1561,7 @@ static struct qcom_icc_bcm bcm_mm0 = {
static struct qcom_icc_bcm bcm_mm1 = {
.name = "MM1",
.enable_mask = 0x1,
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 8,
.nodes = { &qnm_camnoc_hf, &qnm_camnoc_icp,
&qnm_camnoc_sf, &qnm_vapss_hcp,
@@ -1564,6 +1573,7 @@ static struct qcom_icc_bcm bcm_qup0 = {
.name = "QUP0",
.keepalive = true,
.vote_scale = 1,
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 1,
.nodes = { &qup0_core_slave },
};
@@ -1572,6 +1582,7 @@ static struct qcom_icc_bcm bcm_qup1 = {
.name = "QUP1",
.keepalive = true,
.vote_scale = 1,
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 1,
.nodes = { &qup1_core_slave },
};
@@ -1580,6 +1591,7 @@ static struct qcom_icc_bcm bcm_qup2 = {
.name = "QUP2",
.keepalive = true,
.vote_scale = 1,
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 1,
.nodes = { &qup2_core_slave },
};
@@ -1587,6 +1599,7 @@ static struct qcom_icc_bcm bcm_qup2 = {
static struct qcom_icc_bcm bcm_sh0 = {
.name = "SH0",
.keepalive = true,
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 1,
.nodes = { &qns_llcc },
};
@@ -1594,6 +1607,7 @@ static struct qcom_icc_bcm bcm_sh0 = {
static struct qcom_icc_bcm bcm_sh1 = {
.name = "SH1",
.enable_mask = 0x1,
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 13,
.nodes = { &alm_gpu_tcu, &alm_sys_tcu,
&chm_apps, &qnm_gpu,
@@ -1607,6 +1621,7 @@ static struct qcom_icc_bcm bcm_sh1 = {
static struct qcom_icc_bcm bcm_sn0 = {
.name = "SN0",
.keepalive = true,
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 1,
.nodes = { &qns_gemnoc_sf },
};
@@ -1614,6 +1629,7 @@ static struct qcom_icc_bcm bcm_sn0 = {
static struct qcom_icc_bcm bcm_sn1 = {
.name = "SN1",
.enable_mask = 0x1,
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 3,
.nodes = { &qhm_gic, &xm_gic,
&qns_gemnoc_gc },
@@ -1621,18 +1637,21 @@ static struct qcom_icc_bcm bcm_sn1 = {
static struct qcom_icc_bcm bcm_sn2 = {
.name = "SN2",
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 1,
.nodes = { &qnm_aggre1_noc },
};
static struct qcom_icc_bcm bcm_sn3 = {
.name = "SN3",
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 1,
.nodes = { &qnm_aggre2_noc },
};
static struct qcom_icc_bcm bcm_sn7 = {
.name = "SN7",
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 1,
.nodes = { &qns_pcie_mem_noc },
};
@@ -1640,24 +1659,28 @@ static struct qcom_icc_bcm bcm_sn7 = {
static struct qcom_icc_bcm bcm_acv_disp = {
.name = "ACV",
.enable_mask = 0x1,
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 1,
.nodes = { &ebi_disp },
};
static struct qcom_icc_bcm bcm_mc0_disp = {
.name = "MC0",
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 1,
.nodes = { &ebi_disp },
};
static struct qcom_icc_bcm bcm_mm0_disp = {
.name = "MM0",
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 1,
.nodes = { &qns_mem_noc_hf_disp },
};
static struct qcom_icc_bcm bcm_sh0_disp = {
.name = "SH0",
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 1,
.nodes = { &qns_llcc_disp },
};
@@ -1665,6 +1688,7 @@ static struct qcom_icc_bcm bcm_sh0_disp = {
static struct qcom_icc_bcm bcm_sh1_disp = {
.name = "SH1",
.enable_mask = 0x1,
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 2,
.nodes = { &qnm_mnoc_hf_disp, &qnm_pcie_disp },
};
@@ -1672,18 +1696,21 @@ static struct qcom_icc_bcm bcm_sh1_disp = {
static struct qcom_icc_bcm bcm_acv_cam_ife_0 = {
.name = "ACV",
.enable_mask = 0x0,
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 1,
.nodes = { &ebi_cam_ife_0 },
};
static struct qcom_icc_bcm bcm_mc0_cam_ife_0 = {
.name = "MC0",
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 1,
.nodes = { &ebi_cam_ife_0 },
};
static struct qcom_icc_bcm bcm_mm0_cam_ife_0 = {
.name = "MM0",
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 1,
.nodes = { &qns_mem_noc_hf_cam_ife_0 },
};
@@ -1691,6 +1718,7 @@ static struct qcom_icc_bcm bcm_mm0_cam_ife_0 = {
static struct qcom_icc_bcm bcm_mm1_cam_ife_0 = {
.name = "MM1",
.enable_mask = 0x1,
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 4,
.nodes = { &qnm_camnoc_hf_cam_ife_0, &qnm_camnoc_icp_cam_ife_0,
&qnm_camnoc_sf_cam_ife_0, &qns_mem_noc_sf_cam_ife_0 },
@@ -1698,6 +1726,7 @@ static struct qcom_icc_bcm bcm_mm1_cam_ife_0 = {
static struct qcom_icc_bcm bcm_sh0_cam_ife_0 = {
.name = "SH0",
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 1,
.nodes = { &qns_llcc_cam_ife_0 },
};
@@ -1705,6 +1734,7 @@ static struct qcom_icc_bcm bcm_sh0_cam_ife_0 = {
static struct qcom_icc_bcm bcm_sh1_cam_ife_0 = {
.name = "SH1",
.enable_mask = 0x1,
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 3,
.nodes = { &qnm_mnoc_hf_cam_ife_0, &qnm_mnoc_sf_cam_ife_0,
&qnm_pcie_cam_ife_0 },
@@ -1713,18 +1743,21 @@ static struct qcom_icc_bcm bcm_sh1_cam_ife_0 = {
static struct qcom_icc_bcm bcm_acv_cam_ife_1 = {
.name = "ACV",
.enable_mask = 0x0,
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 1,
.nodes = { &ebi_cam_ife_1 },
};
static struct qcom_icc_bcm bcm_mc0_cam_ife_1 = {
.name = "MC0",
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 1,
.nodes = { &ebi_cam_ife_1 },
};
static struct qcom_icc_bcm bcm_mm0_cam_ife_1 = {
.name = "MM0",
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 1,
.nodes = { &qns_mem_noc_hf_cam_ife_1 },
};
@@ -1732,6 +1765,7 @@ static struct qcom_icc_bcm bcm_mm0_cam_ife_1 = {
static struct qcom_icc_bcm bcm_mm1_cam_ife_1 = {
.name = "MM1",
.enable_mask = 0x1,
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 4,
.nodes = { &qnm_camnoc_hf_cam_ife_1, &qnm_camnoc_icp_cam_ife_1,
&qnm_camnoc_sf_cam_ife_1, &qns_mem_noc_sf_cam_ife_1 },
@@ -1739,6 +1773,7 @@ static struct qcom_icc_bcm bcm_mm1_cam_ife_1 = {
static struct qcom_icc_bcm bcm_sh0_cam_ife_1 = {
.name = "SH0",
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 1,
.nodes = { &qns_llcc_cam_ife_1 },
};
@@ -1746,6 +1781,7 @@ static struct qcom_icc_bcm bcm_sh0_cam_ife_1 = {
static struct qcom_icc_bcm bcm_sh1_cam_ife_1 = {
.name = "SH1",
.enable_mask = 0x1,
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 3,
.nodes = { &qnm_mnoc_hf_cam_ife_1, &qnm_mnoc_sf_cam_ife_1,
&qnm_pcie_cam_ife_1 },
@@ -1754,18 +1790,21 @@ static struct qcom_icc_bcm bcm_sh1_cam_ife_1 = {
static struct qcom_icc_bcm bcm_acv_cam_ife_2 = {
.name = "ACV",
.enable_mask = 0x0,
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 1,
.nodes = { &ebi_cam_ife_2 },
};
static struct qcom_icc_bcm bcm_mc0_cam_ife_2 = {
.name = "MC0",
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 1,
.nodes = { &ebi_cam_ife_2 },
};
static struct qcom_icc_bcm bcm_mm0_cam_ife_2 = {
.name = "MM0",
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 1,
.nodes = { &qns_mem_noc_hf_cam_ife_2 },
};
@@ -1773,6 +1812,7 @@ static struct qcom_icc_bcm bcm_mm0_cam_ife_2 = {
static struct qcom_icc_bcm bcm_mm1_cam_ife_2 = {
.name = "MM1",
.enable_mask = 0x1,
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 4,
.nodes = { &qnm_camnoc_hf_cam_ife_2, &qnm_camnoc_icp_cam_ife_2,
&qnm_camnoc_sf_cam_ife_2, &qns_mem_noc_sf_cam_ife_2 },
@@ -1780,6 +1820,7 @@ static struct qcom_icc_bcm bcm_mm1_cam_ife_2 = {
static struct qcom_icc_bcm bcm_sh0_cam_ife_2 = {
.name = "SH0",
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 1,
.nodes = { &qns_llcc_cam_ife_2 },
};
@@ -1787,6 +1828,7 @@ static struct qcom_icc_bcm bcm_sh0_cam_ife_2 = {
static struct qcom_icc_bcm bcm_sh1_cam_ife_2 = {
.name = "SH1",
.enable_mask = 0x1,
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 3,
.nodes = { &qnm_mnoc_hf_cam_ife_2, &qnm_mnoc_sf_cam_ife_2,
&qnm_pcie_cam_ife_2 },
--
2.41.0
