[PATCH 27/53] interconnect: qcom: sa8775p: Explicitly assign voter_idx
From: Konrad Dybcio
Date: Tue Jul 11 2023 - 08:21:09 EST
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/sa8775p.c | 28 ++++++++++++++++++++++++++++
1 file changed, 28 insertions(+)
diff --git a/drivers/interconnect/qcom/sa8775p.c b/drivers/interconnect/qcom/sa8775p.c
index f56538669de0..0c8ef127f8a8 100644
--- a/drivers/interconnect/qcom/sa8775p.c
+++ b/drivers/interconnect/qcom/sa8775p.c
@@ -1873,6 +1873,7 @@ static struct qcom_icc_node srvc_snoc = {
static struct qcom_icc_bcm bcm_acv = {
.name = "ACV",
+ .voter_idx = ICC_BCM_VOTER_APPS,
.enable_mask = 0x8,
.num_nodes = 1,
.nodes = { &ebi },
@@ -1880,6 +1881,7 @@ static struct qcom_icc_bcm bcm_acv = {
static struct qcom_icc_bcm bcm_ce0 = {
.name = "CE0",
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 2,
.nodes = { &qxm_crypto_0, &qxm_crypto_1 },
};
@@ -1887,12 +1889,14 @@ static struct qcom_icc_bcm bcm_ce0 = {
static struct qcom_icc_bcm bcm_cn0 = {
.name = "CN0",
.keepalive = true,
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 2,
.nodes = { &qnm_gemnoc_cnoc, &qnm_gemnoc_pcie },
};
static struct qcom_icc_bcm bcm_cn1 = {
.name = "CN1",
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 76,
.nodes = { &qhs_ahb2phy0, &qhs_ahb2phy1,
&qhs_ahb2phy2, &qhs_ahb2phy3,
@@ -1936,6 +1940,7 @@ static struct qcom_icc_bcm bcm_cn1 = {
static struct qcom_icc_bcm bcm_cn2 = {
.name = "CN2",
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 4,
.nodes = { &qhs_qup0, &qhs_qup1,
&qhs_qup2, &qhs_qup3 },
@@ -1943,18 +1948,21 @@ static struct qcom_icc_bcm bcm_cn2 = {
static struct qcom_icc_bcm bcm_cn3 = {
.name = "CN3",
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 2,
.nodes = { &xs_pcie_0, &xs_pcie_1 },
};
static struct qcom_icc_bcm bcm_gna0 = {
.name = "GNA0",
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 1,
.nodes = { &qxm_dsp0 },
};
static struct qcom_icc_bcm bcm_gnb0 = {
.name = "GNB0",
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 1,
.nodes = { &qxm_dsp1 },
};
@@ -1962,6 +1970,7 @@ static struct qcom_icc_bcm bcm_gnb0 = {
static struct qcom_icc_bcm bcm_mc0 = {
.name = "MC0",
.keepalive = true,
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 1,
.nodes = { &ebi },
};
@@ -1969,6 +1978,7 @@ static struct qcom_icc_bcm bcm_mc0 = {
static struct qcom_icc_bcm bcm_mm0 = {
.name = "MM0",
.keepalive = true,
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 5,
.nodes = { &qnm_camnoc_hf, &qnm_mdp0_0,
&qnm_mdp0_1, &qnm_mdp1_0,
@@ -1977,6 +1987,7 @@ static struct qcom_icc_bcm bcm_mm0 = {
static struct qcom_icc_bcm bcm_mm1 = {
.name = "MM1",
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 7,
.nodes = { &qnm_camnoc_icp, &qnm_camnoc_sf,
&qnm_video0, &qnm_video1,
@@ -1986,30 +1997,35 @@ static struct qcom_icc_bcm bcm_mm1 = {
static struct qcom_icc_bcm bcm_nsa0 = {
.name = "NSA0",
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 2,
.nodes = { &qns_hcp, &qns_nsp_gemnoc },
};
static struct qcom_icc_bcm bcm_nsa1 = {
.name = "NSA1",
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 1,
.nodes = { &qxm_nsp },
};
static struct qcom_icc_bcm bcm_nsb0 = {
.name = "NSB0",
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 2,
.nodes = { &qns_nspb_gemnoc, &qns_nspb_hcp },
};
static struct qcom_icc_bcm bcm_nsb1 = {
.name = "NSB1",
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 1,
.nodes = { &qxm_nspb },
};
static struct qcom_icc_bcm bcm_pci0 = {
.name = "PCI0",
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 1,
.nodes = { &qns_pcie_mem_noc },
};
@@ -2017,6 +2033,7 @@ static struct qcom_icc_bcm bcm_pci0 = {
static struct qcom_icc_bcm bcm_qup0 = {
.name = "QUP0",
.vote_scale = 1,
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 1,
.nodes = { &qup0_core_slave },
};
@@ -2024,6 +2041,7 @@ static struct qcom_icc_bcm bcm_qup0 = {
static struct qcom_icc_bcm bcm_qup1 = {
.name = "QUP1",
.vote_scale = 1,
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 1,
.nodes = { &qup1_core_slave },
};
@@ -2031,6 +2049,7 @@ static struct qcom_icc_bcm bcm_qup1 = {
static struct qcom_icc_bcm bcm_qup2 = {
.name = "QUP2",
.vote_scale = 1,
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 2,
.nodes = { &qup2_core_slave, &qup3_core_slave },
};
@@ -2038,12 +2057,14 @@ 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 },
};
static struct qcom_icc_bcm bcm_sh2 = {
.name = "SH2",
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 1,
.nodes = { &chm_apps },
};
@@ -2051,42 +2072,49 @@ static struct qcom_icc_bcm bcm_sh2 = {
static struct qcom_icc_bcm bcm_sn0 = {
.name = "SN0",
.keepalive = true,
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 1,
.nodes = { &qns_gemnoc_sf },
};
static struct qcom_icc_bcm bcm_sn1 = {
.name = "SN1",
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 1,
.nodes = { &qns_gemnoc_gc },
};
static struct qcom_icc_bcm bcm_sn2 = {
.name = "SN2",
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 1,
.nodes = { &qxs_pimem },
};
static struct qcom_icc_bcm bcm_sn3 = {
.name = "SN3",
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 2,
.nodes = { &qns_a1noc_snoc, &qnm_aggre1_noc },
};
static struct qcom_icc_bcm bcm_sn4 = {
.name = "SN4",
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 2,
.nodes = { &qns_a2noc_snoc, &qnm_aggre2_noc },
};
static struct qcom_icc_bcm bcm_sn9 = {
.name = "SN9",
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 2,
.nodes = { &qns_sysnoc, &qnm_lpass_noc },
};
static struct qcom_icc_bcm bcm_sn10 = {
.name = "SN10",
+ .voter_idx = ICC_BCM_VOTER_APPS,
.num_nodes = 1,
.nodes = { &xs_qdss_stm },
};
--
2.41.0