Skip to content

L
linux
Commit 6025a81a authored by Georgi Djakov's avatar Georgi Djakov
Browse files
Options

Merge branch 'icc-cleanup' into icc-next 

* icc-cleanup
  interconnect: qcom: sm8550: Remove bogus per-RSC BCMs and nodes
  dt-bindings: interconnect: Remove bogus interconnect nodes
  interconnect: qcom: x1e80100: Remove bogus per-RSC BCMs and nodes
  interconnect: qcom: sa8775p: constify pointer to qcom_icc_node
  interconnect: qcom: sm8250: constify pointer to qcom_icc_node
  interconnect: qcom: sm6115: constify pointer to qcom_icc_node
  interconnect: qcom: sa8775p: constify pointer to qcom_icc_bcm
  interconnect: qcom: x1e80100: constify pointer to qcom_icc_bcm
  dt-bindings: interconnect: qcom,rpmh: Fix bouncing @codeaurora address
  interconnect: constify of_phandle_args in xlate
Signed-off-by: default avatarGeorgi Djakov <djakov@kernel.org>
parents cd6d762c 0dc5b8ab
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 189 additions and 1138 deletions
Documentation/devicetree/bindings/interconnect/qcom,rpmh.yaml
View file @ 6025a81a
...@@ -8,7 +8,7 @@ title: Qualcomm RPMh Network-On-Chip Interconnect ...@@ -8,7 +8,7 @@ title: Qualcomm RPMh Network-On-Chip Interconnect
maintainers: maintainers:
- Georgi Djakov <georgi.djakov@linaro.org> - Georgi Djakov <georgi.djakov@linaro.org>
- Odelu Kukatla <okukatla@codeaurora.org> - Odelu Kukatla <quic_okukatla@quicinc.com>
description: | description: |
RPMh interconnect providers support system bandwidth requirements through RPMh interconnect providers support system bandwidth requirements through
......
drivers/interconnect/core.c
View file @ 6025a81a
...@@ -343,7 +343,7 @@ EXPORT_SYMBOL_GPL(icc_std_aggregate); ...@@ -343,7 +343,7 @@ EXPORT_SYMBOL_GPL(icc_std_aggregate);
* an array of icc nodes specified in the icc_onecell_data struct when * an array of icc nodes specified in the icc_onecell_data struct when
* registering the provider. * registering the provider.
*/ */
struct icc_node *of_icc_xlate_onecell(struct of_phandle_args *spec, struct icc_node *of_icc_xlate_onecell(const struct of_phandle_args *spec,
void *data) void *data)
{ {
struct icc_onecell_data *icc_data = data; struct icc_onecell_data *icc_data = data;
...@@ -368,7 +368,7 @@ EXPORT_SYMBOL_GPL(of_icc_xlate_onecell); ...@@ -368,7 +368,7 @@ EXPORT_SYMBOL_GPL(of_icc_xlate_onecell);
* Returns a valid pointer to struct icc_node_data on success or ERR_PTR() * Returns a valid pointer to struct icc_node_data on success or ERR_PTR()
* on failure. * on failure.
*/ */
struct icc_node_data *of_icc_get_from_provider(struct of_phandle_args *spec) struct icc_node_data *of_icc_get_from_provider(const struct of_phandle_args *spec)
{ {
struct icc_node *node = ERR_PTR(-EPROBE_DEFER); struct icc_node *node = ERR_PTR(-EPROBE_DEFER);
struct icc_node_data *data = NULL; struct icc_node_data *data = NULL;
......
drivers/interconnect/qcom/icc-common.c
View file @ 6025a81a
...@@ -9,7 +9,8 @@ ...@@ -9,7 +9,8 @@
#include "icc-common.h" #include "icc-common.h"
struct icc_node_data *qcom_icc_xlate_extended(struct of_phandle_args *spec, void *data) struct icc_node_data *qcom_icc_xlate_extended(const struct of_phandle_args *spec,
void *data)
{ {
struct icc_node_data *ndata; struct icc_node_data *ndata;
struct icc_node *node; struct icc_node *node;
......
drivers/interconnect/qcom/icc-common.h
View file @ 6025a81a
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
#include <linux/interconnect-provider.h> #include <linux/interconnect-provider.h>
struct icc_node_data *qcom_icc_xlate_extended(struct of_phandle_args *spec, void *data); struct icc_node_data *qcom_icc_xlate_extended(const struct of_phandle_args *spec,
void *data);
#endif #endif
drivers/interconnect/qcom/sa8775p.c
View file @ 6025a81a
...@@ -2092,11 +2092,11 @@ static struct qcom_icc_bcm bcm_sn10 = { ...@@ -2092,11 +2092,11 @@ static struct qcom_icc_bcm bcm_sn10 = {
.nodes = { &xs_qdss_stm }, .nodes = { &xs_qdss_stm },
}; };
static struct qcom_icc_bcm *aggre1_noc_bcms[] = { static struct qcom_icc_bcm * const aggre1_noc_bcms[] = {
&bcm_sn3, &bcm_sn3,
}; };
static struct qcom_icc_node *aggre1_noc_nodes[] = { static struct qcom_icc_node * const aggre1_noc_nodes[] = {
[MASTER_QUP_3] = &qxm_qup3, [MASTER_QUP_3] = &qxm_qup3,
[MASTER_EMAC] = &xm_emac_0, [MASTER_EMAC] = &xm_emac_0,
[MASTER_EMAC_1] = &xm_emac_1, [MASTER_EMAC_1] = &xm_emac_1,
...@@ -2115,12 +2115,12 @@ static const struct qcom_icc_desc sa8775p_aggre1_noc = { ...@@ -2115,12 +2115,12 @@ static const struct qcom_icc_desc sa8775p_aggre1_noc = {
.num_bcms = ARRAY_SIZE(aggre1_noc_bcms), .num_bcms = ARRAY_SIZE(aggre1_noc_bcms),
}; };
static struct qcom_icc_bcm *aggre2_noc_bcms[] = { static struct qcom_icc_bcm * const aggre2_noc_bcms[] = {
&bcm_ce0, &bcm_ce0,
&bcm_sn4, &bcm_sn4,
}; };
static struct qcom_icc_node *aggre2_noc_nodes[] = { static struct qcom_icc_node * const aggre2_noc_nodes[] = {
[MASTER_QDSS_BAM] = &qhm_qdss_bam, [MASTER_QDSS_BAM] = &qhm_qdss_bam,
[MASTER_QUP_0] = &qhm_qup0, [MASTER_QUP_0] = &qhm_qup0,
[MASTER_QUP_1] = &qhm_qup1, [MASTER_QUP_1] = &qhm_qup1,
...@@ -2142,13 +2142,13 @@ static const struct qcom_icc_desc sa8775p_aggre2_noc = { ...@@ -2142,13 +2142,13 @@ static const struct qcom_icc_desc sa8775p_aggre2_noc = {
.num_bcms = ARRAY_SIZE(aggre2_noc_bcms), .num_bcms = ARRAY_SIZE(aggre2_noc_bcms),
}; };
static struct qcom_icc_bcm *clk_virt_bcms[] = { static struct qcom_icc_bcm * const clk_virt_bcms[] = {
&bcm_qup0, &bcm_qup0,
&bcm_qup1, &bcm_qup1,
&bcm_qup2, &bcm_qup2,
}; };
static struct qcom_icc_node *clk_virt_nodes[] = { static struct qcom_icc_node * const clk_virt_nodes[] = {
[MASTER_QUP_CORE_0] = &qup0_core_master, [MASTER_QUP_CORE_0] = &qup0_core_master,
[MASTER_QUP_CORE_1] = &qup1_core_master, [MASTER_QUP_CORE_1] = &qup1_core_master,
[MASTER_QUP_CORE_2] = &qup2_core_master, [MASTER_QUP_CORE_2] = &qup2_core_master,
...@@ -2166,7 +2166,7 @@ static const struct qcom_icc_desc sa8775p_clk_virt = { ...@@ -2166,7 +2166,7 @@ static const struct qcom_icc_desc sa8775p_clk_virt = {
.num_bcms = ARRAY_SIZE(clk_virt_bcms), .num_bcms = ARRAY_SIZE(clk_virt_bcms),
}; };
static struct qcom_icc_bcm *config_noc_bcms[] = { static struct qcom_icc_bcm * const config_noc_bcms[] = {
&bcm_cn0, &bcm_cn0,
&bcm_cn1, &bcm_cn1,
&bcm_cn2, &bcm_cn2,
...@@ -2175,7 +2175,7 @@ static struct qcom_icc_bcm *config_noc_bcms[] = { ...@@ -2175,7 +2175,7 @@ static struct qcom_icc_bcm *config_noc_bcms[] = {
&bcm_sn10, &bcm_sn10,
}; };
static struct qcom_icc_node *config_noc_nodes[] = { static struct qcom_icc_node * const config_noc_nodes[] = {
[MASTER_GEM_NOC_CNOC] = &qnm_gemnoc_cnoc, [MASTER_GEM_NOC_CNOC] = &qnm_gemnoc_cnoc,
[MASTER_GEM_NOC_PCIE_SNOC] = &qnm_gemnoc_pcie, [MASTER_GEM_NOC_PCIE_SNOC] = &qnm_gemnoc_pcie,
[SLAVE_AHB2PHY_0] = &qhs_ahb2phy0, [SLAVE_AHB2PHY_0] = &qhs_ahb2phy0,
...@@ -2271,10 +2271,10 @@ static const struct qcom_icc_desc sa8775p_config_noc = { ...@@ -2271,10 +2271,10 @@ static const struct qcom_icc_desc sa8775p_config_noc = {
.num_bcms = ARRAY_SIZE(config_noc_bcms), .num_bcms = ARRAY_SIZE(config_noc_bcms),
}; };
static struct qcom_icc_bcm *dc_noc_bcms[] = { static struct qcom_icc_bcm * const dc_noc_bcms[] = {
}; };
static struct qcom_icc_node *dc_noc_nodes[] = { static struct qcom_icc_node * const dc_noc_nodes[] = {
[MASTER_CNOC_DC_NOC] = &qnm_cnoc_dc_noc, [MASTER_CNOC_DC_NOC] = &qnm_cnoc_dc_noc,
[SLAVE_LLCC_CFG] = &qhs_llcc, [SLAVE_LLCC_CFG] = &qhs_llcc,
[SLAVE_GEM_NOC_CFG] = &qns_gemnoc, [SLAVE_GEM_NOC_CFG] = &qns_gemnoc,
...@@ -2287,12 +2287,12 @@ static const struct qcom_icc_desc sa8775p_dc_noc = { ...@@ -2287,12 +2287,12 @@ static const struct qcom_icc_desc sa8775p_dc_noc = {
.num_bcms = ARRAY_SIZE(dc_noc_bcms), .num_bcms = ARRAY_SIZE(dc_noc_bcms),
}; };
static struct qcom_icc_bcm *gem_noc_bcms[] = { static struct qcom_icc_bcm * const gem_noc_bcms[] = {
&bcm_sh0, &bcm_sh0,
&bcm_sh2, &bcm_sh2,
}; };
static struct qcom_icc_node *gem_noc_nodes[] = { static struct qcom_icc_node * const gem_noc_nodes[] = {
[MASTER_GPU_TCU] = &alm_gpu_tcu, [MASTER_GPU_TCU] = &alm_gpu_tcu,
[MASTER_PCIE_TCU] = &alm_pcie_tcu, [MASTER_PCIE_TCU] = &alm_pcie_tcu,
[MASTER_SYS_TCU] = &alm_sys_tcu, [MASTER_SYS_TCU] = &alm_sys_tcu,
...@@ -2323,12 +2323,12 @@ static const struct qcom_icc_desc sa8775p_gem_noc = { ...@@ -2323,12 +2323,12 @@ static const struct qcom_icc_desc sa8775p_gem_noc = {
.num_bcms = ARRAY_SIZE(gem_noc_bcms), .num_bcms = ARRAY_SIZE(gem_noc_bcms),
}; };
static struct qcom_icc_bcm *gpdsp_anoc_bcms[] = { static struct qcom_icc_bcm * const gpdsp_anoc_bcms[] = {
&bcm_gna0, &bcm_gna0,
&bcm_gnb0, &bcm_gnb0,
}; };
static struct qcom_icc_node *gpdsp_anoc_nodes[] = { static struct qcom_icc_node * const gpdsp_anoc_nodes[] = {
[MASTER_DSP0] = &qxm_dsp0, [MASTER_DSP0] = &qxm_dsp0,
[MASTER_DSP1] = &qxm_dsp1, [MASTER_DSP1] = &qxm_dsp1,
[SLAVE_GP_DSP_SAIL_NOC] = &qns_gp_dsp_sail_noc, [SLAVE_GP_DSP_SAIL_NOC] = &qns_gp_dsp_sail_noc,
...@@ -2341,11 +2341,11 @@ static const struct qcom_icc_desc sa8775p_gpdsp_anoc = { ...@@ -2341,11 +2341,11 @@ static const struct qcom_icc_desc sa8775p_gpdsp_anoc = {
.num_bcms = ARRAY_SIZE(gpdsp_anoc_bcms), .num_bcms = ARRAY_SIZE(gpdsp_anoc_bcms),
}; };
static struct qcom_icc_bcm *lpass_ag_noc_bcms[] = { static struct qcom_icc_bcm * const lpass_ag_noc_bcms[] = {
&bcm_sn9, &bcm_sn9,
}; };
static struct qcom_icc_node *lpass_ag_noc_nodes[] = { static struct qcom_icc_node * const lpass_ag_noc_nodes[] = {
[MASTER_CNOC_LPASS_AG_NOC] = &qhm_config_noc, [MASTER_CNOC_LPASS_AG_NOC] = &qhm_config_noc,
[MASTER_LPASS_PROC] = &qxm_lpass_dsp, [MASTER_LPASS_PROC] = &qxm_lpass_dsp,
[SLAVE_LPASS_CORE_CFG] = &qhs_lpass_core, [SLAVE_LPASS_CORE_CFG] = &qhs_lpass_core,
...@@ -2364,12 +2364,12 @@ static const struct qcom_icc_desc sa8775p_lpass_ag_noc = { ...@@ -2364,12 +2364,12 @@ static const struct qcom_icc_desc sa8775p_lpass_ag_noc = {
.num_bcms = ARRAY_SIZE(lpass_ag_noc_bcms), .num_bcms = ARRAY_SIZE(lpass_ag_noc_bcms),
}; };
static struct qcom_icc_bcm *mc_virt_bcms[] = { static struct qcom_icc_bcm * const mc_virt_bcms[] = {
&bcm_acv, &bcm_acv,
&bcm_mc0, &bcm_mc0,
}; };
static struct qcom_icc_node *mc_virt_nodes[] = { static struct qcom_icc_node * const mc_virt_nodes[] = {
[MASTER_LLCC] = &llcc_mc, [MASTER_LLCC] = &llcc_mc,
[SLAVE_EBI1] = &ebi, [SLAVE_EBI1] = &ebi,
}; };
...@@ -2381,12 +2381,12 @@ static const struct qcom_icc_desc sa8775p_mc_virt = { ...@@ -2381,12 +2381,12 @@ static const struct qcom_icc_desc sa8775p_mc_virt = {
.num_bcms = ARRAY_SIZE(mc_virt_bcms), .num_bcms = ARRAY_SIZE(mc_virt_bcms),
}; };
static struct qcom_icc_bcm *mmss_noc_bcms[] = { static struct qcom_icc_bcm * const mmss_noc_bcms[] = {
&bcm_mm0, &bcm_mm0,
&bcm_mm1, &bcm_mm1,
}; };
static struct qcom_icc_node *mmss_noc_nodes[] = { static struct qcom_icc_node * const mmss_noc_nodes[] = {
[MASTER_CAMNOC_HF] = &qnm_camnoc_hf, [MASTER_CAMNOC_HF] = &qnm_camnoc_hf,
[MASTER_CAMNOC_ICP] = &qnm_camnoc_icp, [MASTER_CAMNOC_ICP] = &qnm_camnoc_icp,
[MASTER_CAMNOC_SF] = &qnm_camnoc_sf, [MASTER_CAMNOC_SF] = &qnm_camnoc_sf,
...@@ -2413,12 +2413,12 @@ static const struct qcom_icc_desc sa8775p_mmss_noc = { ...@@ -2413,12 +2413,12 @@ static const struct qcom_icc_desc sa8775p_mmss_noc = {
.num_bcms = ARRAY_SIZE(mmss_noc_bcms), .num_bcms = ARRAY_SIZE(mmss_noc_bcms),
}; };
static struct qcom_icc_bcm *nspa_noc_bcms[] = { static struct qcom_icc_bcm * const nspa_noc_bcms[] = {
&bcm_nsa0, &bcm_nsa0,
&bcm_nsa1, &bcm_nsa1,
}; };
static struct qcom_icc_node *nspa_noc_nodes[] = { static struct qcom_icc_node * const nspa_noc_nodes[] = {
[MASTER_CDSP_NOC_CFG] = &qhm_nsp_noc_config, [MASTER_CDSP_NOC_CFG] = &qhm_nsp_noc_config,
[MASTER_CDSP_PROC] = &qxm_nsp, [MASTER_CDSP_PROC] = &qxm_nsp,
[SLAVE_HCP_A] = &qns_hcp, [SLAVE_HCP_A] = &qns_hcp,
...@@ -2433,12 +2433,12 @@ static const struct qcom_icc_desc sa8775p_nspa_noc = { ...@@ -2433,12 +2433,12 @@ static const struct qcom_icc_desc sa8775p_nspa_noc = {
.num_bcms = ARRAY_SIZE(nspa_noc_bcms), .num_bcms = ARRAY_SIZE(nspa_noc_bcms),
}; };
static struct qcom_icc_bcm *nspb_noc_bcms[] = { static struct qcom_icc_bcm * const nspb_noc_bcms[] = {
&bcm_nsb0, &bcm_nsb0,
&bcm_nsb1, &bcm_nsb1,
}; };
static struct qcom_icc_node *nspb_noc_nodes[] = { static struct qcom_icc_node * const nspb_noc_nodes[] = {
[MASTER_CDSPB_NOC_CFG] = &qhm_nspb_noc_config, [MASTER_CDSPB_NOC_CFG] = &qhm_nspb_noc_config,
[MASTER_CDSP_PROC_B] = &qxm_nspb, [MASTER_CDSP_PROC_B] = &qxm_nspb,
[SLAVE_CDSPB_MEM_NOC] = &qns_nspb_gemnoc, [SLAVE_CDSPB_MEM_NOC] = &qns_nspb_gemnoc,
...@@ -2453,11 +2453,11 @@ static const struct qcom_icc_desc sa8775p_nspb_noc = { ...@@ -2453,11 +2453,11 @@ static const struct qcom_icc_desc sa8775p_nspb_noc = {
.num_bcms = ARRAY_SIZE(nspb_noc_bcms), .num_bcms = ARRAY_SIZE(nspb_noc_bcms),
}; };
static struct qcom_icc_bcm *pcie_anoc_bcms[] = { static struct qcom_icc_bcm * const pcie_anoc_bcms[] = {
&bcm_pci0, &bcm_pci0,
}; };
static struct qcom_icc_node *pcie_anoc_nodes[] = { static struct qcom_icc_node * const pcie_anoc_nodes[] = {
[MASTER_PCIE_0] = &xm_pcie3_0, [MASTER_PCIE_0] = &xm_pcie3_0,
[MASTER_PCIE_1] = &xm_pcie3_1, [MASTER_PCIE_1] = &xm_pcie3_1,
[SLAVE_ANOC_PCIE_GEM_NOC] = &qns_pcie_mem_noc, [SLAVE_ANOC_PCIE_GEM_NOC] = &qns_pcie_mem_noc,
...@@ -2470,7 +2470,7 @@ static const struct qcom_icc_desc sa8775p_pcie_anoc = { ...@@ -2470,7 +2470,7 @@ static const struct qcom_icc_desc sa8775p_pcie_anoc = {
.num_bcms = ARRAY_SIZE(pcie_anoc_bcms), .num_bcms = ARRAY_SIZE(pcie_anoc_bcms),
}; };
static struct qcom_icc_bcm *system_noc_bcms[] = { static struct qcom_icc_bcm * const system_noc_bcms[] = {
&bcm_sn0, &bcm_sn0,
&bcm_sn1, &bcm_sn1,
&bcm_sn3, &bcm_sn3,
...@@ -2478,7 +2478,7 @@ static struct qcom_icc_bcm *system_noc_bcms[] = { ...@@ -2478,7 +2478,7 @@ static struct qcom_icc_bcm *system_noc_bcms[] = {
&bcm_sn9, &bcm_sn9,
}; };
static struct qcom_icc_node *system_noc_nodes[] = { static struct qcom_icc_node * const system_noc_nodes[] = {
[MASTER_GIC_AHB] = &qhm_gic, [MASTER_GIC_AHB] = &qhm_gic,
[MASTER_A1NOC_SNOC] = &qnm_aggre1_noc, [MASTER_A1NOC_SNOC] = &qnm_aggre1_noc,
[MASTER_A2NOC_SNOC] = &qnm_aggre2_noc, [MASTER_A2NOC_SNOC] = &qnm_aggre2_noc,
......
drivers/interconnect/qcom/sm6115.c
View file @ 6025a81a
...@@ -1193,7 +1193,7 @@ static struct qcom_icc_node slv_anoc_snoc = { ...@@ -1193,7 +1193,7 @@ static struct qcom_icc_node slv_anoc_snoc = {
.links = slv_anoc_snoc_links, .links = slv_anoc_snoc_links,
}; };
static struct qcom_icc_node *bimc_nodes[] = { static struct qcom_icc_node * const bimc_nodes[] = {
[MASTER_AMPSS_M0] = &apps_proc, [MASTER_AMPSS_M0] = &apps_proc,
[MASTER_SNOC_BIMC_RT] = &mas_snoc_bimc_rt, [MASTER_SNOC_BIMC_RT] = &mas_snoc_bimc_rt,
[MASTER_SNOC_BIMC_NRT] = &mas_snoc_bimc_nrt, [MASTER_SNOC_BIMC_NRT] = &mas_snoc_bimc_nrt,
...@@ -1223,7 +1223,7 @@ static const struct qcom_icc_desc sm6115_bimc = { ...@@ -1223,7 +1223,7 @@ static const struct qcom_icc_desc sm6115_bimc = {
.ab_coeff = 153, .ab_coeff = 153,
}; };
static struct qcom_icc_node *config_noc_nodes[] = { static struct qcom_icc_node * const config_noc_nodes[] = {
[SNOC_CNOC_MAS] = &mas_snoc_cnoc, [SNOC_CNOC_MAS] = &mas_snoc_cnoc,
[MASTER_QDSS_DAP] = &xm_dap, [MASTER_QDSS_DAP] = &xm_dap,
[SLAVE_AHB2PHY_USB] = &qhs_ahb2phy_usb, [SLAVE_AHB2PHY_USB] = &qhs_ahb2phy_usb,
...@@ -1294,7 +1294,7 @@ static const struct qcom_icc_desc sm6115_config_noc = { ...@@ -1294,7 +1294,7 @@ static const struct qcom_icc_desc sm6115_config_noc = {
.keep_alive = true, .keep_alive = true,
}; };
static struct qcom_icc_node *sys_noc_nodes[] = { static struct qcom_icc_node * const sys_noc_nodes[] = {
[MASTER_CRYPTO_CORE0] = &crypto_c0, [MASTER_CRYPTO_CORE0] = &crypto_c0,
[MASTER_SNOC_CFG] = &qhm_snoc_cfg, [MASTER_SNOC_CFG] = &qhm_snoc_cfg,
[MASTER_TIC] = &qhm_tic, [MASTER_TIC] = &qhm_tic,
...@@ -1339,7 +1339,7 @@ static const struct qcom_icc_desc sm6115_sys_noc = { ...@@ -1339,7 +1339,7 @@ static const struct qcom_icc_desc sm6115_sys_noc = {
.keep_alive = true, .keep_alive = true,
}; };
static struct qcom_icc_node *clk_virt_nodes[] = { static struct qcom_icc_node * const clk_virt_nodes[] = {
[MASTER_QUP_CORE_0] = &qup0_core_master, [MASTER_QUP_CORE_0] = &qup0_core_master,
[SLAVE_QUP_CORE_0] = &qup0_core_slave, [SLAVE_QUP_CORE_0] = &qup0_core_slave,
}; };
...@@ -1353,7 +1353,7 @@ static const struct qcom_icc_desc sm6115_clk_virt = { ...@@ -1353,7 +1353,7 @@ static const struct qcom_icc_desc sm6115_clk_virt = {
.keep_alive = true, .keep_alive = true,
}; };
static struct qcom_icc_node *mmnrt_virt_nodes[] = { static struct qcom_icc_node * const mmnrt_virt_nodes[] = {
[MASTER_CAMNOC_SF] = &qnm_camera_nrt, [MASTER_CAMNOC_SF] = &qnm_camera_nrt,
[MASTER_VIDEO_P0] = &qxm_venus0, [MASTER_VIDEO_P0] = &qxm_venus0,
[MASTER_VIDEO_PROC] = &qxm_venus_cpu, [MASTER_VIDEO_PROC] = &qxm_venus_cpu,
...@@ -1370,7 +1370,7 @@ static const struct qcom_icc_desc sm6115_mmnrt_virt = { ...@@ -1370,7 +1370,7 @@ static const struct qcom_icc_desc sm6115_mmnrt_virt = {
.ab_coeff = 142, .ab_coeff = 142,
}; };
static struct qcom_icc_node *mmrt_virt_nodes[] = { static struct qcom_icc_node * const mmrt_virt_nodes[] = {
[MASTER_CAMNOC_HF] = &qnm_camera_rt, [MASTER_CAMNOC_HF] = &qnm_camera_rt,
[MASTER_MDP_PORT0] = &qxm_mdp0, [MASTER_MDP_PORT0] = &qxm_mdp0,
[SLAVE_SNOC_BIMC_RT] = &slv_snoc_bimc_rt, [SLAVE_SNOC_BIMC_RT] = &slv_snoc_bimc_rt,
......
drivers/interconnect/qcom/sm8250.c
View file @ 6025a81a
...@@ -1673,7 +1673,7 @@ static struct qcom_icc_bcm * const qup_virt_bcms[] = { ...@@ -1673,7 +1673,7 @@ static struct qcom_icc_bcm * const qup_virt_bcms[] = {
&bcm_qup0, &bcm_qup0,
}; };
static struct qcom_icc_node *qup_virt_nodes[] = { static struct qcom_icc_node * const qup_virt_nodes[] = {
[MASTER_QUP_CORE_0] = &qup0_core_master, [MASTER_QUP_CORE_0] = &qup0_core_master,
[MASTER_QUP_CORE_1] = &qup1_core_master, [MASTER_QUP_CORE_1] = &qup1_core_master,
[MASTER_QUP_CORE_2] = &qup2_core_master, [MASTER_QUP_CORE_2] = &qup2_core_master,
......
drivers/interconnect/qcom/sm8550.c
View file @ 6025a81a
This diff is collapsed.
drivers/interconnect/qcom/sm8550.h
View file @ 6025a81a
This diff is collapsed.
drivers/interconnect/qcom/x1e80100.c
View file @ 6025a81a
This diff is collapsed.
drivers/interconnect/samsung/exynos.c
View file @ 6025a81a
...@@ -82,7 +82,7 @@ static int exynos_generic_icc_set(struct icc_node *src, struct icc_node *dst) ...@@ -82,7 +82,7 @@ static int exynos_generic_icc_set(struct icc_node *src, struct icc_node *dst)
return 0; return 0;
} }
static struct icc_node *exynos_generic_icc_xlate(struct of_phandle_args *spec, static struct icc_node *exynos_generic_icc_xlate(const struct of_phandle_args *spec,
void *data) void *data)
{ {
struct exynos_icc_priv *priv = data; struct exynos_icc_priv *priv = data;
......
drivers/memory/tegra/mc.c
View file @ 6025a81a
...@@ -755,7 +755,7 @@ const char *const tegra_mc_error_names[8] = { ...@@ -755,7 +755,7 @@ const char *const tegra_mc_error_names[8] = {
[6] = "SMMU translation error", [6] = "SMMU translation error",
}; };
struct icc_node *tegra_mc_icc_xlate(struct of_phandle_args *spec, void *data) struct icc_node *tegra_mc_icc_xlate(const struct of_phandle_args *spec, void *data)
{ {
struct tegra_mc *mc = icc_provider_to_tegra_mc(data); struct tegra_mc *mc = icc_provider_to_tegra_mc(data);
struct icc_node *node; struct icc_node *node;
......
drivers/memory/tegra/tegra124-emc.c
View file @ 6025a81a
...@@ -1285,7 +1285,7 @@ to_tegra_emc_provider(struct icc_provider *provider) ...@@ -1285,7 +1285,7 @@ to_tegra_emc_provider(struct icc_provider *provider)
} }
static struct icc_node_data * static struct icc_node_data *
emc_of_icc_xlate_extended(struct of_phandle_args *spec, void *data) emc_of_icc_xlate_extended(const struct of_phandle_args *spec, void *data)
{ {
struct icc_provider *provider = data; struct icc_provider *provider = data;
struct icc_node_data *ndata; struct icc_node_data *ndata;
......
drivers/memory/tegra/tegra124.c
View file @ 6025a81a
...@@ -1170,7 +1170,7 @@ static int tegra124_mc_icc_aggreate(struct icc_node *node, u32 tag, u32 avg_bw, ...@@ -1170,7 +1170,7 @@ static int tegra124_mc_icc_aggreate(struct icc_node *node, u32 tag, u32 avg_bw,
} }
static struct icc_node_data * static struct icc_node_data *
tegra124_mc_of_icc_xlate_extended(struct of_phandle_args *spec, void *data) tegra124_mc_of_icc_xlate_extended(const struct of_phandle_args *spec, void *data)
{ {
struct tegra_mc *mc = icc_provider_to_tegra_mc(data); struct tegra_mc *mc = icc_provider_to_tegra_mc(data);
const struct tegra_mc_client *client; const struct tegra_mc_client *client;
......
drivers/memory/tegra/tegra186-emc.c
View file @ 6025a81a
...@@ -236,7 +236,7 @@ static int tegra_emc_icc_set_bw(struct icc_node *src, struct icc_node *dst) ...@@ -236,7 +236,7 @@ static int tegra_emc_icc_set_bw(struct icc_node *src, struct icc_node *dst)
} }
static struct icc_node * static struct icc_node *
tegra_emc_of_icc_xlate(struct of_phandle_args *spec, void *data) tegra_emc_of_icc_xlate(const struct of_phandle_args *spec, void *data)
{ {
struct icc_provider *provider = data; struct icc_provider *provider = data;
struct icc_node *node; struct icc_node *node;
......
drivers/memory/tegra/tegra20-emc.c
View file @ 6025a81a
...@@ -950,7 +950,7 @@ to_tegra_emc_provider(struct icc_provider *provider) ...@@ -950,7 +950,7 @@ to_tegra_emc_provider(struct icc_provider *provider)
} }
static struct icc_node_data * static struct icc_node_data *
emc_of_icc_xlate_extended(struct of_phandle_args *spec, void *data) emc_of_icc_xlate_extended(const struct of_phandle_args *spec, void *data)
{ {
struct icc_provider *provider = data; struct icc_provider *provider = data;
struct icc_node_data *ndata; struct icc_node_data *ndata;
......
drivers/memory/tegra/tegra20.c
View file @ 6025a81a
...@@ -390,7 +390,7 @@ static int tegra20_mc_icc_aggreate(struct icc_node *node, u32 tag, u32 avg_bw, ...@@ -390,7 +390,7 @@ static int tegra20_mc_icc_aggreate(struct icc_node *node, u32 tag, u32 avg_bw,
} }
static struct icc_node_data * static struct icc_node_data *
tegra20_mc_of_icc_xlate_extended(struct of_phandle_args *spec, void *data) tegra20_mc_of_icc_xlate_extended(const struct of_phandle_args *spec, void *data)
{ {
struct tegra_mc *mc = icc_provider_to_tegra_mc(data); struct tegra_mc *mc = icc_provider_to_tegra_mc(data);
unsigned int i, idx = spec->args[0]; unsigned int i, idx = spec->args[0];
......
drivers/memory/tegra/tegra30-emc.c
View file @ 6025a81a
...@@ -1468,7 +1468,7 @@ to_tegra_emc_provider(struct icc_provider *provider) ...@@ -1468,7 +1468,7 @@ to_tegra_emc_provider(struct icc_provider *provider)
} }
static struct icc_node_data * static struct icc_node_data *
emc_of_icc_xlate_extended(struct of_phandle_args *spec, void *data) emc_of_icc_xlate_extended(const struct of_phandle_args *spec, void *data)
{ {
struct icc_provider *provider = data; struct icc_provider *provider = data;
struct icc_node_data *ndata; struct icc_node_data *ndata;
......
drivers/memory/tegra/tegra30.c
View file @ 6025a81a
...@@ -1332,7 +1332,7 @@ static int tegra30_mc_icc_aggreate(struct icc_node *node, u32 tag, u32 avg_bw, ...@@ -1332,7 +1332,7 @@ static int tegra30_mc_icc_aggreate(struct icc_node *node, u32 tag, u32 avg_bw,
} }
static struct icc_node_data * static struct icc_node_data *
tegra30_mc_of_icc_xlate_extended(struct of_phandle_args *spec, void *data) tegra30_mc_of_icc_xlate_extended(const struct of_phandle_args *spec, void *data)
{ {
struct tegra_mc *mc = icc_provider_to_tegra_mc(data); struct tegra_mc *mc = icc_provider_to_tegra_mc(data);
const struct tegra_mc_client *client; const struct tegra_mc_client *client;
......
include/dt-bindings/interconnect/qcom,x1e80100-rpmh.h
View file @ 6025a81a
...@@ -112,11 +112,6 @@ ...@@ -112,11 +112,6 @@
#define SLAVE_GEM_NOC_CNOC 12 #define SLAVE_GEM_NOC_CNOC 12
#define SLAVE_LLCC 13 #define SLAVE_LLCC 13
#define SLAVE_MEM_NOC_PCIE_SNOC 14 #define SLAVE_MEM_NOC_PCIE_SNOC 14
#define MASTER_MNOC_HF_MEM_NOC_DISP 15
#define MASTER_ANOC_PCIE_GEM_NOC_DISP 16
#define SLAVE_LLCC_DISP 17
#define MASTER_ANOC_PCIE_GEM_NOC_PCIE 18
#define SLAVE_LLCC_PCIE 19
#define MASTER_LPIAON_NOC 0 #define MASTER_LPIAON_NOC 0
#define SLAVE_LPASS_GEM_NOC 1 #define SLAVE_LPASS_GEM_NOC 1
...@@ -129,10 +124,6 @@ ...@@ -129,10 +124,6 @@
#define MASTER_LLCC 0 #define MASTER_LLCC 0
#define SLAVE_EBI1 1 #define SLAVE_EBI1 1
#define MASTER_LLCC_DISP 2
#define SLAVE_EBI1_DISP 3
#define MASTER_LLCC_PCIE 4
#define SLAVE_EBI1_PCIE 5
#define MASTER_AV1_ENC 0 #define MASTER_AV1_ENC 0
#define MASTER_CAMNOC_HF 1 #define MASTER_CAMNOC_HF 1
...@@ -147,8 +138,6 @@ ...@@ -147,8 +138,6 @@
#define SLAVE_MNOC_HF_MEM_NOC 10 #define SLAVE_MNOC_HF_MEM_NOC 10
#define SLAVE_MNOC_SF_MEM_NOC 11 #define SLAVE_MNOC_SF_MEM_NOC 11
#define SLAVE_SERVICE_MNOC 12 #define SLAVE_SERVICE_MNOC 12
#define MASTER_MDP_DISP 13
#define SLAVE_MNOC_HF_MEM_NOC_DISP 14
#define MASTER_CDSP_PROC 0 #define MASTER_CDSP_PROC 0
#define SLAVE_CDSP_MEM_NOC 1 #define SLAVE_CDSP_MEM_NOC 1
...@@ -156,18 +145,11 @@ ...@@ -156,18 +145,11 @@
#define MASTER_PCIE_NORTH 0 #define MASTER_PCIE_NORTH 0
#define MASTER_PCIE_SOUTH 1 #define MASTER_PCIE_SOUTH 1
#define SLAVE_ANOC_PCIE_GEM_NOC 2 #define SLAVE_ANOC_PCIE_GEM_NOC 2
#define MASTER_PCIE_NORTH_PCIE 3
#define MASTER_PCIE_SOUTH_PCIE 4
#define SLAVE_ANOC_PCIE_GEM_NOC_PCIE 5
#define MASTER_PCIE_3 0 #define MASTER_PCIE_3 0
#define MASTER_PCIE_4 1 #define MASTER_PCIE_4 1
#define MASTER_PCIE_5 2 #define MASTER_PCIE_5 2
#define SLAVE_PCIE_NORTH 3 #define SLAVE_PCIE_NORTH 3
#define MASTER_PCIE_3_PCIE 4
#define MASTER_PCIE_4_PCIE 5
#define MASTER_PCIE_5_PCIE 6
#define SLAVE_PCIE_NORTH_PCIE 7
#define MASTER_PCIE_0 0 #define MASTER_PCIE_0 0
#define MASTER_PCIE_1 1 #define MASTER_PCIE_1 1
...@@ -175,12 +157,6 @@ ...@@ -175,12 +157,6 @@
#define MASTER_PCIE_6A 3 #define MASTER_PCIE_6A 3
#define MASTER_PCIE_6B 4 #define MASTER_PCIE_6B 4
#define SLAVE_PCIE_SOUTH 5 #define SLAVE_PCIE_SOUTH 5
#define MASTER_PCIE_0_PCIE 6
#define MASTER_PCIE_1_PCIE 7
#define MASTER_PCIE_2_PCIE 8
#define MASTER_PCIE_6A_PCIE 9
#define MASTER_PCIE_6B_PCIE 10
#define SLAVE_PCIE_SOUTH_PCIE 11
#define MASTER_A1NOC_SNOC 0 #define MASTER_A1NOC_SNOC 0
#define MASTER_A2NOC_SNOC 1 #define MASTER_A2NOC_SNOC 1
......
include/linux/interconnect-provider.h
View file @ 6025a81a
...@@ -36,7 +36,7 @@ struct icc_onecell_data { ...@@ -36,7 +36,7 @@ struct icc_onecell_data {
struct icc_node *nodes[] __counted_by(num_nodes); struct icc_node *nodes[] __counted_by(num_nodes);
}; };
struct icc_node *of_icc_xlate_onecell(struct of_phandle_args *spec, struct icc_node *of_icc_xlate_onecell(const struct of_phandle_args *spec,
void *data); void *data);
/** /**
...@@ -65,8 +65,9 @@ struct icc_provider { ...@@ -65,8 +65,9 @@ struct icc_provider {
u32 peak_bw, u32 *agg_avg, u32 *agg_peak); u32 peak_bw, u32 *agg_avg, u32 *agg_peak);
void (*pre_aggregate)(struct icc_node *node); void (*pre_aggregate)(struct icc_node *node);
int (*get_bw)(struct icc_node *node, u32 *avg, u32 *peak); int (*get_bw)(struct icc_node *node, u32 *avg, u32 *peak);
struct icc_node* (*xlate)(struct of_phandle_args *spec, void *data); struct icc_node* (*xlate)(const struct of_phandle_args *spec, void *data);
struct icc_node_data* (*xlate_extended)(struct of_phandle_args *spec, void *data); struct icc_node_data* (*xlate_extended)(const struct of_phandle_args *spec,
void *data);
struct device *dev; struct device *dev;
int users; int users;
bool inter_set; bool inter_set;
...@@ -124,7 +125,7 @@ int icc_nodes_remove(struct icc_provider *provider); ...@@ -124,7 +125,7 @@ int icc_nodes_remove(struct icc_provider *provider);
void icc_provider_init(struct icc_provider *provider); void icc_provider_init(struct icc_provider *provider);
int icc_provider_register(struct icc_provider *provider); int icc_provider_register(struct icc_provider *provider);
void icc_provider_deregister(struct icc_provider *provider); void icc_provider_deregister(struct icc_provider *provider);
struct icc_node_data *of_icc_get_from_provider(struct of_phandle_args *spec); struct icc_node_data *of_icc_get_from_provider(const struct of_phandle_args *spec);
void icc_sync_state(struct device *dev); void icc_sync_state(struct device *dev);
#else #else
...@@ -171,7 +172,7 @@ static inline int icc_provider_register(struct icc_provider *provider) ...@@ -171,7 +172,7 @@ static inline int icc_provider_register(struct icc_provider *provider)
static inline void icc_provider_deregister(struct icc_provider *provider) { } static inline void icc_provider_deregister(struct icc_provider *provider) { }
static inline struct icc_node_data *of_icc_get_from_provider(struct of_phandle_args *spec) static inline struct icc_node_data *of_icc_get_from_provider(const struct of_phandle_args *spec)
{ {
return ERR_PTR(-ENOTSUPP); return ERR_PTR(-ENOTSUPP);
} }
......
include/soc/tegra/mc.h
View file @ 6025a81a
...@@ -146,13 +146,14 @@ struct tegra_mc_icc_ops { ...@@ -146,13 +146,14 @@ struct tegra_mc_icc_ops {
int (*set)(struct icc_node *src, struct icc_node *dst); int (*set)(struct icc_node *src, struct icc_node *dst);
int (*aggregate)(struct icc_node *node, u32 tag, u32 avg_bw, int (*aggregate)(struct icc_node *node, u32 tag, u32 avg_bw,
u32 peak_bw, u32 *agg_avg, u32 *agg_peak); u32 peak_bw, u32 *agg_avg, u32 *agg_peak);
struct icc_node* (*xlate)(struct of_phandle_args *spec, void *data); struct icc_node* (*xlate)(const struct of_phandle_args *spec, void *data);
struct icc_node_data *(*xlate_extended)(struct of_phandle_args *spec, struct icc_node_data *(*xlate_extended)(const struct of_phandle_args *spec,
void *data); void *data);
int (*get_bw)(struct icc_node *node, u32 *avg, u32 *peak); int (*get_bw)(struct icc_node *node, u32 *avg, u32 *peak);
}; };
struct icc_node *tegra_mc_icc_xlate(struct of_phandle_args *spec, void *data); struct icc_node *tegra_mc_icc_xlate(const struct of_phandle_args *spec,
void *data);
extern const struct tegra_mc_icc_ops tegra_mc_icc_ops; extern const struct tegra_mc_icc_ops tegra_mc_icc_ops;
struct tegra_mc_ops { struct tegra_mc_ops {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7