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/sc8180x.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/drivers/interconnect/qcom/sc8180x.c b/drivers/interconnect/qcom/sc8180x.c index c76e3a6a98cd..a811cbf2cd15 100644 --- a/drivers/interconnect/qcom/sc8180x.c +++ b/drivers/interconnect/qcom/sc8180x.c @@ -1344,6 +1344,7 @@ static struct qcom_icc_node slv_qup_core_2 = { static struct qcom_icc_bcm bcm_acv = { .name = "ACV", + .voter_idx = ICC_BCM_VOTER_APPS, .num_nodes = 1, .nodes = { &slv_ebi } }; @@ -1351,6 +1352,7 @@ static struct qcom_icc_bcm bcm_acv = { static struct qcom_icc_bcm bcm_mc0 = { .name = "MC0", .keepalive = true, + .voter_idx = ICC_BCM_VOTER_APPS, .num_nodes = 1, .nodes = { &slv_ebi } }; @@ -1358,24 +1360,28 @@ static struct qcom_icc_bcm bcm_mc0 = { static struct qcom_icc_bcm bcm_sh0 = { .name = "SH0", .keepalive = true, + .voter_idx = ICC_BCM_VOTER_APPS, .num_nodes = 1, .nodes = { &slv_qns_llcc } }; static struct qcom_icc_bcm bcm_mm0 = { .name = "MM0", + .voter_idx = ICC_BCM_VOTER_APPS, .num_nodes = 1, .nodes = { &slv_qns_mem_noc_hf } }; static struct qcom_icc_bcm bcm_co0 = { .name = "CO0", + .voter_idx = ICC_BCM_VOTER_APPS, .num_nodes = 1, .nodes = { &slv_qns_cdsp_mem_noc } }; static struct qcom_icc_bcm bcm_ce0 = { .name = "CE0", + .voter_idx = ICC_BCM_VOTER_APPS, .num_nodes = 1, .nodes = { &mas_qxm_crypto } }; @@ -1383,6 +1389,7 @@ 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 = 57, .nodes = { &mas_qnm_snoc, &slv_qhs_a1_noc_cfg, @@ -1445,6 +1452,7 @@ static struct qcom_icc_bcm bcm_cn0 = { static struct qcom_icc_bcm bcm_mm1 = { .name = "MM1", + .voter_idx = ICC_BCM_VOTER_APPS, .num_nodes = 7, .nodes = { &mas_qxm_camnoc_hf0_uncomp, &mas_qxm_camnoc_hf1_uncomp, @@ -1457,6 +1465,7 @@ static struct qcom_icc_bcm bcm_mm1 = { static struct qcom_icc_bcm bcm_qup0 = { .name = "QUP0", + .voter_idx = ICC_BCM_VOTER_APPS, .num_nodes = 3, .nodes = { &mas_qup_core_0, &mas_qup_core_1, @@ -1465,12 +1474,14 @@ static struct qcom_icc_bcm bcm_qup0 = { static struct qcom_icc_bcm bcm_sh2 = { .name = "SH2", + .voter_idx = ICC_BCM_VOTER_APPS, .num_nodes = 1, .nodes = { &slv_qns_gem_noc_snoc } }; static struct qcom_icc_bcm bcm_mm2 = { .name = "MM2", + .voter_idx = ICC_BCM_VOTER_APPS, .num_nodes = 6, .nodes = { &mas_qxm_camnoc_sf, &mas_qxm_rot, @@ -1483,45 +1494,53 @@ static struct qcom_icc_bcm bcm_mm2 = { static struct qcom_icc_bcm bcm_sh3 = { .name = "SH3", .keepalive = true, + .voter_idx = ICC_BCM_VOTER_APPS, .num_nodes = 1, .nodes = { &mas_acm_apps } }; static struct qcom_icc_bcm bcm_sn0 = { .name = "SN0", + .voter_idx = ICC_BCM_VOTER_APPS, .nodes = { &slv_qns_gemnoc_sf } }; static struct qcom_icc_bcm bcm_sn1 = { .name = "SN1", + .voter_idx = ICC_BCM_VOTER_APPS, .nodes = { &slv_qxs_imem } }; static struct qcom_icc_bcm bcm_sn2 = { .name = "SN2", .keepalive = true, + .voter_idx = ICC_BCM_VOTER_APPS, .nodes = { &slv_qns_gemnoc_gc } }; static struct qcom_icc_bcm bcm_co2 = { .name = "CO2", + .voter_idx = ICC_BCM_VOTER_APPS, .nodes = { &mas_qnm_npu } }; static struct qcom_icc_bcm bcm_sn3 = { .name = "SN3", .keepalive = true, + .voter_idx = ICC_BCM_VOTER_APPS, .nodes = { &slv_srvc_aggre1_noc, &slv_qns_cnoc } }; static struct qcom_icc_bcm bcm_sn4 = { .name = "SN4", + .voter_idx = ICC_BCM_VOTER_APPS, .nodes = { &slv_qxs_pimem } }; static struct qcom_icc_bcm bcm_sn8 = { .name = "SN8", + .voter_idx = ICC_BCM_VOTER_APPS, .num_nodes = 4, .nodes = { &slv_xs_pcie_0, &slv_xs_pcie_1, @@ -1531,18 +1550,21 @@ static struct qcom_icc_bcm bcm_sn8 = { static struct qcom_icc_bcm bcm_sn9 = { .name = "SN9", + .voter_idx = ICC_BCM_VOTER_APPS, .num_nodes = 1, .nodes = { &mas_qnm_aggre1_noc } }; static struct qcom_icc_bcm bcm_sn11 = { .name = "SN11", + .voter_idx = ICC_BCM_VOTER_APPS, .num_nodes = 1, .nodes = { &mas_qnm_aggre2_noc } }; static struct qcom_icc_bcm bcm_sn14 = { .name = "SN14", + .voter_idx = ICC_BCM_VOTER_APPS, .num_nodes = 1, .nodes = { &slv_qns_pcie_mem_noc } }; @@ -1550,6 +1572,7 @@ static struct qcom_icc_bcm bcm_sn14 = { static struct qcom_icc_bcm bcm_sn15 = { .name = "SN15", .keepalive = true, + .voter_idx = ICC_BCM_VOTER_APPS, .num_nodes = 1, .nodes = { &mas_qnm_gemnoc } }; -- 2.41.0