interconnect: qcom: sc8280xp: convert to dynamic IDs

Stop using fixed and IDs and covert the platform to use dynamic IDs for
the interconnect. This gives more flexibility and also allows us to drop
the .num_links member, saving from possible errors related to it being
not set or set incorrectly.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Link: https://lore.kernel.org/r/20251031-rework-icc-v3-4-0575304c9624@oss.qualcomm.com
Signed-off-by: Georgi Djakov <djakov@kernel.org>

diff --git a/drivers/interconnect/qcom/sc8280xp.c b/drivers/interconnect/qcom/sc8280xp.c
index c646cdf8a19bf6f5a581cd9491b104259259fff3..c46846191e63f41a16dd3af5f0a77919b4b14568 100644 (file)
--- a/drivers/interconnect/qcom/sc8280xp.c
+++ b/drivers/interconnect/qcom/sc8280xp.c
@@ -14,1699 +14,1682 @@
 
 #include "bcm-voter.h"
 #include "icc-rpmh.h"
-#include "sc8280xp.h"
+
+static struct qcom_icc_node qhm_qspi;
+static struct qcom_icc_node qhm_qup1;
+static struct qcom_icc_node qhm_qup2;
+static struct qcom_icc_node qnm_a1noc_cfg;
+static struct qcom_icc_node qxm_ipa;
+static struct qcom_icc_node xm_emac_1;
+static struct qcom_icc_node xm_sdc4;
+static struct qcom_icc_node xm_ufs_mem;
+static struct qcom_icc_node xm_usb3_0;
+static struct qcom_icc_node xm_usb3_1;
+static struct qcom_icc_node xm_usb3_mp;
+static struct qcom_icc_node xm_usb4_host0;
+static struct qcom_icc_node xm_usb4_host1;
+static struct qcom_icc_node qhm_qdss_bam;
+static struct qcom_icc_node qhm_qup0;
+static struct qcom_icc_node qnm_a2noc_cfg;
+static struct qcom_icc_node qxm_crypto;
+static struct qcom_icc_node qxm_sensorss_q6;
+static struct qcom_icc_node qxm_sp;
+static struct qcom_icc_node xm_emac_0;
+static struct qcom_icc_node xm_pcie3_0;
+static struct qcom_icc_node xm_pcie3_1;
+static struct qcom_icc_node xm_pcie3_2a;
+static struct qcom_icc_node xm_pcie3_2b;
+static struct qcom_icc_node xm_pcie3_3a;
+static struct qcom_icc_node xm_pcie3_3b;
+static struct qcom_icc_node xm_pcie3_4;
+static struct qcom_icc_node xm_qdss_etr;
+static struct qcom_icc_node xm_sdc2;
+static struct qcom_icc_node xm_ufs_card;
+static struct qcom_icc_node qup0_core_master;
+static struct qcom_icc_node qup1_core_master;
+static struct qcom_icc_node qup2_core_master;
+static struct qcom_icc_node qnm_gemnoc_cnoc;
+static struct qcom_icc_node qnm_gemnoc_pcie;
+static struct qcom_icc_node qnm_cnoc_dc_noc;
+static struct qcom_icc_node alm_gpu_tcu;
+static struct qcom_icc_node alm_pcie_tcu;
+static struct qcom_icc_node alm_sys_tcu;
+static struct qcom_icc_node chm_apps;
+static struct qcom_icc_node qnm_cmpnoc0;
+static struct qcom_icc_node qnm_cmpnoc1;
+static struct qcom_icc_node qnm_gemnoc_cfg;
+static struct qcom_icc_node qnm_gpu;
+static struct qcom_icc_node qnm_mnoc_hf;
+static struct qcom_icc_node qnm_mnoc_sf;
+static struct qcom_icc_node qnm_pcie;
+static struct qcom_icc_node qnm_snoc_gc;
+static struct qcom_icc_node qnm_snoc_sf;
+static struct qcom_icc_node qhm_config_noc;
+static struct qcom_icc_node qxm_lpass_dsp;
+static struct qcom_icc_node llcc_mc;
+static struct qcom_icc_node qnm_camnoc_hf;
+static struct qcom_icc_node qnm_mdp0_0;
+static struct qcom_icc_node qnm_mdp0_1;
+static struct qcom_icc_node qnm_mdp1_0;
+static struct qcom_icc_node qnm_mdp1_1;
+static struct qcom_icc_node qnm_mnoc_cfg;
+static struct qcom_icc_node qnm_rot_0;
+static struct qcom_icc_node qnm_rot_1;
+static struct qcom_icc_node qnm_video0;
+static struct qcom_icc_node qnm_video1;
+static struct qcom_icc_node qnm_video_cvp;
+static struct qcom_icc_node qxm_camnoc_icp;
+static struct qcom_icc_node qxm_camnoc_sf;
+static struct qcom_icc_node qhm_nsp_noc_config;
+static struct qcom_icc_node qxm_nsp;
+static struct qcom_icc_node qhm_nspb_noc_config;
+static struct qcom_icc_node qxm_nspb;
+static struct qcom_icc_node qnm_aggre1_noc;
+static struct qcom_icc_node qnm_aggre2_noc;
+static struct qcom_icc_node qnm_aggre_usb_noc;
+static struct qcom_icc_node qnm_lpass_noc;
+static struct qcom_icc_node qnm_snoc_cfg;
+static struct qcom_icc_node qxm_pimem;
+static struct qcom_icc_node xm_gic;
+static struct qcom_icc_node qns_a1noc_snoc;
+static struct qcom_icc_node qns_aggre_usb_snoc;
+static struct qcom_icc_node srvc_aggre1_noc;
+static struct qcom_icc_node qns_a2noc_snoc;
+static struct qcom_icc_node qns_pcie_gem_noc;
+static struct qcom_icc_node srvc_aggre2_noc;
+static struct qcom_icc_node qup0_core_slave;
+static struct qcom_icc_node qup1_core_slave;
+static struct qcom_icc_node qup2_core_slave;
+static struct qcom_icc_node qhs_ahb2phy0;
+static struct qcom_icc_node qhs_ahb2phy1;
+static struct qcom_icc_node qhs_ahb2phy2;
+static struct qcom_icc_node qhs_aoss;
+static struct qcom_icc_node qhs_apss;
+static struct qcom_icc_node qhs_camera_cfg;
+static struct qcom_icc_node qhs_clk_ctl;
+static struct qcom_icc_node qhs_compute0_cfg;
+static struct qcom_icc_node qhs_compute1_cfg;
+static struct qcom_icc_node qhs_cpr_cx;
+static struct qcom_icc_node qhs_cpr_mmcx;
+static struct qcom_icc_node qhs_cpr_mx;
+static struct qcom_icc_node qhs_cpr_nspcx;
+static struct qcom_icc_node qhs_crypto0_cfg;
+static struct qcom_icc_node qhs_cx_rdpm;
+static struct qcom_icc_node qhs_dcc_cfg;
+static struct qcom_icc_node qhs_display0_cfg;
+static struct qcom_icc_node qhs_display1_cfg;
+static struct qcom_icc_node qhs_emac0_cfg;
+static struct qcom_icc_node qhs_emac1_cfg;
+static struct qcom_icc_node qhs_gpuss_cfg;
+static struct qcom_icc_node qhs_hwkm;
+static struct qcom_icc_node qhs_imem_cfg;
+static struct qcom_icc_node qhs_ipa;
+static struct qcom_icc_node qhs_ipc_router;
+static struct qcom_icc_node qhs_lpass_cfg;
+static struct qcom_icc_node qhs_mx_rdpm;
+static struct qcom_icc_node qhs_mxc_rdpm;
+static struct qcom_icc_node qhs_pcie0_cfg;
+static struct qcom_icc_node qhs_pcie1_cfg;
+static struct qcom_icc_node qhs_pcie2a_cfg;
+static struct qcom_icc_node qhs_pcie2b_cfg;
+static struct qcom_icc_node qhs_pcie3a_cfg;
+static struct qcom_icc_node qhs_pcie3b_cfg;
+static struct qcom_icc_node qhs_pcie4_cfg;
+static struct qcom_icc_node qhs_pcie_rsc_cfg;
+static struct qcom_icc_node qhs_pdm;
+static struct qcom_icc_node qhs_pimem_cfg;
+static struct qcom_icc_node qhs_pka_wrapper_cfg;
+static struct qcom_icc_node qhs_pmu_wrapper_cfg;
+static struct qcom_icc_node qhs_qdss_cfg;
+static struct qcom_icc_node qhs_qspi;
+static struct qcom_icc_node qhs_qup0;
+static struct qcom_icc_node qhs_qup1;
+static struct qcom_icc_node qhs_qup2;
+static struct qcom_icc_node qhs_sdc2;
+static struct qcom_icc_node qhs_sdc4;
+static struct qcom_icc_node qhs_security;
+static struct qcom_icc_node qhs_smmuv3_cfg;
+static struct qcom_icc_node qhs_smss_cfg;
+static struct qcom_icc_node qhs_spss_cfg;
+static struct qcom_icc_node qhs_tcsr;
+static struct qcom_icc_node qhs_tlmm;
+static struct qcom_icc_node qhs_ufs_card_cfg;
+static struct qcom_icc_node qhs_ufs_mem_cfg;
+static struct qcom_icc_node qhs_usb3_0;
+static struct qcom_icc_node qhs_usb3_1;
+static struct qcom_icc_node qhs_usb3_mp;
+static struct qcom_icc_node qhs_usb4_host_0;
+static struct qcom_icc_node qhs_usb4_host_1;
+static struct qcom_icc_node qhs_venus_cfg;
+static struct qcom_icc_node qhs_vsense_ctrl_cfg;
+static struct qcom_icc_node qhs_vsense_ctrl_r_cfg;
+static struct qcom_icc_node qns_a1_noc_cfg;
+static struct qcom_icc_node qns_a2_noc_cfg;
+static struct qcom_icc_node qns_anoc_pcie_bridge_cfg;
+static struct qcom_icc_node qns_ddrss_cfg;
+static struct qcom_icc_node qns_mnoc_cfg;
+static struct qcom_icc_node qns_snoc_cfg;
+static struct qcom_icc_node qns_snoc_sf_bridge_cfg;
+static struct qcom_icc_node qxs_imem;
+static struct qcom_icc_node qxs_pimem;
+static struct qcom_icc_node srvc_cnoc;
+static struct qcom_icc_node xs_pcie_0;
+static struct qcom_icc_node xs_pcie_1;
+static struct qcom_icc_node xs_pcie_2a;
+static struct qcom_icc_node xs_pcie_2b;
+static struct qcom_icc_node xs_pcie_3a;
+static struct qcom_icc_node xs_pcie_3b;
+static struct qcom_icc_node xs_pcie_4;
+static struct qcom_icc_node xs_qdss_stm;
+static struct qcom_icc_node xs_smss;
+static struct qcom_icc_node xs_sys_tcu_cfg;
+static struct qcom_icc_node qhs_llcc;
+static struct qcom_icc_node qns_gemnoc;
+static struct qcom_icc_node qns_gem_noc_cnoc;
+static struct qcom_icc_node qns_llcc;
+static struct qcom_icc_node qns_pcie;
+static struct qcom_icc_node srvc_even_gemnoc;
+static struct qcom_icc_node srvc_odd_gemnoc;
+static struct qcom_icc_node srvc_sys_gemnoc;
+static struct qcom_icc_node qhs_lpass_core;
+static struct qcom_icc_node qhs_lpass_lpi;
+static struct qcom_icc_node qhs_lpass_mpu;
+static struct qcom_icc_node qhs_lpass_top;
+static struct qcom_icc_node qns_sysnoc;
+static struct qcom_icc_node srvc_niu_aml_noc;
+static struct qcom_icc_node srvc_niu_lpass_agnoc;
+static struct qcom_icc_node ebi;
+static struct qcom_icc_node qns_mem_noc_hf;
+static struct qcom_icc_node qns_mem_noc_sf;
+static struct qcom_icc_node srvc_mnoc;
+static struct qcom_icc_node qns_nsp_gemnoc;
+static struct qcom_icc_node qxs_nsp_xfr;
+static struct qcom_icc_node service_nsp_noc;
+static struct qcom_icc_node qns_nspb_gemnoc;
+static struct qcom_icc_node qxs_nspb_xfr;
+static struct qcom_icc_node service_nspb_noc;
+static struct qcom_icc_node qns_gemnoc_gc;
+static struct qcom_icc_node qns_gemnoc_sf;
+static struct qcom_icc_node srvc_snoc;
 
 static struct qcom_icc_node qhm_qspi = {
        .name = "qhm_qspi",
-       .id = SC8280XP_MASTER_QSPI_0,
        .channels = 1,
        .buswidth = 4,
        .num_links = 1,
-       .links = { SC8280XP_SLAVE_A1NOC_SNOC },
+       .link_nodes = { &qns_a1noc_snoc },
 };
 
 static struct qcom_icc_node qhm_qup1 = {
        .name = "qhm_qup1",
-       .id = SC8280XP_MASTER_QUP_1,
        .channels = 1,
        .buswidth = 4,
        .num_links = 1,
-       .links = { SC8280XP_SLAVE_A1NOC_SNOC },
+       .link_nodes = { &qns_a1noc_snoc },
 };
 
 static struct qcom_icc_node qhm_qup2 = {
        .name = "qhm_qup2",
-       .id = SC8280XP_MASTER_QUP_2,
        .channels = 1,
        .buswidth = 4,
        .num_links = 1,
-       .links = { SC8280XP_SLAVE_A1NOC_SNOC },
+       .link_nodes = { &qns_a1noc_snoc },
 };
 
 static struct qcom_icc_node qnm_a1noc_cfg = {
        .name = "qnm_a1noc_cfg",
-       .id = SC8280XP_MASTER_A1NOC_CFG,
        .channels = 1,
        .buswidth = 4,
        .num_links = 1,
-       .links = { SC8280XP_SLAVE_SERVICE_A1NOC },
+       .link_nodes = { &srvc_aggre1_noc },
 };
 
 static struct qcom_icc_node qxm_ipa = {
        .name = "qxm_ipa",
-       .id = SC8280XP_MASTER_IPA,
        .channels = 1,
        .buswidth = 8,
        .num_links = 1,
-       .links = { SC8280XP_SLAVE_A1NOC_SNOC },
+       .link_nodes = { &qns_a1noc_snoc },
 };
 
 static struct qcom_icc_node xm_emac_1 = {
        .name = "xm_emac_1",
-       .id = SC8280XP_MASTER_EMAC_1,
        .channels = 1,
        .buswidth = 8,
        .num_links = 1,
-       .links = { SC8280XP_SLAVE_A1NOC_SNOC },
+       .link_nodes = { &qns_a1noc_snoc },
 };
 
 static struct qcom_icc_node xm_sdc4 = {
        .name = "xm_sdc4",
-       .id = SC8280XP_MASTER_SDCC_4,
        .channels = 1,
        .buswidth = 8,
        .num_links = 1,
-       .links = { SC8280XP_SLAVE_A1NOC_SNOC },
+       .link_nodes = { &qns_a1noc_snoc },
 };
 
 static struct qcom_icc_node xm_ufs_mem = {
        .name = "xm_ufs_mem",
-       .id = SC8280XP_MASTER_UFS_MEM,
        .channels = 1,
        .buswidth = 8,
        .num_links = 1,
-       .links = { SC8280XP_SLAVE_A1NOC_SNOC },
+       .link_nodes = { &qns_a1noc_snoc },
 };
 
 static struct qcom_icc_node xm_usb3_0 = {
        .name = "xm_usb3_0",
-       .id = SC8280XP_MASTER_USB3_0,
        .channels = 1,
        .buswidth = 8,
        .num_links = 1,
-       .links = { SC8280XP_SLAVE_USB_NOC_SNOC },
+       .link_nodes = { &qns_aggre_usb_snoc },
 };
 
 static struct qcom_icc_node xm_usb3_1 = {
        .name = "xm_usb3_1",
-       .id = SC8280XP_MASTER_USB3_1,
        .channels = 1,
        .buswidth = 8,
        .num_links = 1,
-       .links = { SC8280XP_SLAVE_USB_NOC_SNOC },
+       .link_nodes = { &qns_aggre_usb_snoc },
 };
 
 static struct qcom_icc_node xm_usb3_mp = {
        .name = "xm_usb3_mp",
-       .id = SC8280XP_MASTER_USB3_MP,
        .channels = 1,
        .buswidth = 16,
        .num_links = 1,
-       .links = { SC8280XP_SLAVE_USB_NOC_SNOC },
+       .link_nodes = { &qns_aggre_usb_snoc },
 };
 
 static struct qcom_icc_node xm_usb4_host0 = {
        .name = "xm_usb4_host0",
-       .id = SC8280XP_MASTER_USB4_0,
        .channels = 1,
        .buswidth = 16,
        .num_links = 1,
-       .links = { SC8280XP_SLAVE_USB_NOC_SNOC },
+       .link_nodes = { &qns_aggre_usb_snoc },
 };
 
 static struct qcom_icc_node xm_usb4_host1 = {
        .name = "xm_usb4_host1",
-       .id = SC8280XP_MASTER_USB4_1,
        .channels = 1,
        .buswidth = 16,
        .num_links = 1,
-       .links = { SC8280XP_SLAVE_USB_NOC_SNOC },
+       .link_nodes = { &qns_aggre_usb_snoc },
 };
 
 static struct qcom_icc_node qhm_qdss_bam = {
        .name = "qhm_qdss_bam",
-       .id = SC8280XP_MASTER_QDSS_BAM,
        .channels = 1,
        .buswidth = 4,
        .num_links = 1,
-       .links = { SC8280XP_SLAVE_A2NOC_SNOC },
+       .link_nodes = { &qns_a2noc_snoc },
 };
 
 static struct qcom_icc_node qhm_qup0 = {
        .name = "qhm_qup0",
-       .id = SC8280XP_MASTER_QUP_0,
        .channels = 1,
        .buswidth = 4,
        .num_links = 1,
-       .links = { SC8280XP_SLAVE_A2NOC_SNOC },
+       .link_nodes = { &qns_a2noc_snoc },
 };
 
 static struct qcom_icc_node qnm_a2noc_cfg = {
        .name = "qnm_a2noc_cfg",
-       .id = SC8280XP_MASTER_A2NOC_CFG,
        .channels = 1,
        .buswidth = 4,
        .num_links = 1,
-       .links = { SC8280XP_SLAVE_SERVICE_A2NOC },
+       .link_nodes = { &srvc_aggre2_noc },
 };
 
 static struct qcom_icc_node qxm_crypto = {
        .name = "qxm_crypto",
-       .id = SC8280XP_MASTER_CRYPTO,
        .channels = 1,
        .buswidth = 8,
        .num_links = 1,
-       .links = { SC8280XP_SLAVE_A2NOC_SNOC },
+       .link_nodes = { &qns_a2noc_snoc },
 };
 
 static struct qcom_icc_node qxm_sensorss_q6 = {
        .name = "qxm_sensorss_q6",
-       .id = SC8280XP_MASTER_SENSORS_PROC,
        .channels = 1,
        .buswidth = 8,
        .num_links = 1,
-       .links = { SC8280XP_SLAVE_A2NOC_SNOC },
+       .link_nodes = { &qns_a2noc_snoc },
 };
 
 static struct qcom_icc_node qxm_sp = {
        .name = "qxm_sp",
-       .id = SC8280XP_MASTER_SP,
        .channels = 1,
        .buswidth = 8,
        .num_links = 1,
-       .links = { SC8280XP_SLAVE_A2NOC_SNOC },
+       .link_nodes = { &qns_a2noc_snoc },
 };
 
 static struct qcom_icc_node xm_emac_0 = {
        .name = "xm_emac_0",
-       .id = SC8280XP_MASTER_EMAC,
        .channels = 1,
        .buswidth = 8,
        .num_links = 1,
-       .links = { SC8280XP_SLAVE_A2NOC_SNOC },
+       .link_nodes = { &qns_a2noc_snoc },
 };
 
 static struct qcom_icc_node xm_pcie3_0 = {
        .name = "xm_pcie3_0",
-       .id = SC8280XP_MASTER_PCIE_0,
        .channels = 1,
        .buswidth = 16,
        .num_links = 1,
-       .links = { SC8280XP_SLAVE_ANOC_PCIE_GEM_NOC },
+       .link_nodes = { &qns_pcie_gem_noc },
 };
 
 static struct qcom_icc_node xm_pcie3_1 = {
        .name = "xm_pcie3_1",
-       .id = SC8280XP_MASTER_PCIE_1,
        .channels = 1,
        .buswidth = 16,
        .num_links = 1,
-       .links = { SC8280XP_SLAVE_ANOC_PCIE_GEM_NOC },
+       .link_nodes = { &qns_pcie_gem_noc },
 };
 
 static struct qcom_icc_node xm_pcie3_2a = {
        .name = "xm_pcie3_2a",
-       .id = SC8280XP_MASTER_PCIE_2A,
        .channels = 1,
        .buswidth = 16,
        .num_links = 1,
-       .links = { SC8280XP_SLAVE_ANOC_PCIE_GEM_NOC },
+       .link_nodes = { &qns_pcie_gem_noc },
 };
 
 static struct qcom_icc_node xm_pcie3_2b = {
        .name = "xm_pcie3_2b",
-       .id = SC8280XP_MASTER_PCIE_2B,
        .channels = 1,
        .buswidth = 8,
        .num_links = 1,
-       .links = { SC8280XP_SLAVE_ANOC_PCIE_GEM_NOC },
+       .link_nodes = { &qns_pcie_gem_noc },
 };
 
 static struct qcom_icc_node xm_pcie3_3a = {
        .name = "xm_pcie3_3a",
-       .id = SC8280XP_MASTER_PCIE_3A,
        .channels = 1,
        .buswidth = 16,
        .num_links = 1,
-       .links = { SC8280XP_SLAVE_ANOC_PCIE_GEM_NOC },
+       .link_nodes = { &qns_pcie_gem_noc },
 };
 
 static struct qcom_icc_node xm_pcie3_3b = {
        .name = "xm_pcie3_3b",
-       .id = SC8280XP_MASTER_PCIE_3B,
        .channels = 1,
        .buswidth = 8,
        .num_links = 1,
-       .links = { SC8280XP_SLAVE_ANOC_PCIE_GEM_NOC },
+       .link_nodes = { &qns_pcie_gem_noc },
 };
 
 static struct qcom_icc_node xm_pcie3_4 = {
        .name = "xm_pcie3_4",
-       .id = SC8280XP_MASTER_PCIE_4,
        .channels = 1,
        .buswidth = 8,
        .num_links = 1,
-       .links = { SC8280XP_SLAVE_ANOC_PCIE_GEM_NOC },
+       .link_nodes = { &qns_pcie_gem_noc },
 };
 
 static struct qcom_icc_node xm_qdss_etr = {
        .name = "xm_qdss_etr",
-       .id = SC8280XP_MASTER_QDSS_ETR,
        .channels = 1,
        .buswidth = 8,
        .num_links = 1,
-       .links = { SC8280XP_SLAVE_A2NOC_SNOC },
+       .link_nodes = { &qns_a2noc_snoc },
 };
 
 static struct qcom_icc_node xm_sdc2 = {
        .name = "xm_sdc2",
-       .id = SC8280XP_MASTER_SDCC_2,
        .channels = 1,
        .buswidth = 8,
        .num_links = 1,
-       .links = { SC8280XP_SLAVE_A2NOC_SNOC },
+       .link_nodes = { &qns_a2noc_snoc },
 };
 
 static struct qcom_icc_node xm_ufs_card = {
        .name = "xm_ufs_card",
-       .id = SC8280XP_MASTER_UFS_CARD,
        .channels = 1,
        .buswidth = 8,
        .num_links = 1,
-       .links = { SC8280XP_SLAVE_A2NOC_SNOC },
+       .link_nodes = { &qns_a2noc_snoc },
 };
 
 static struct qcom_icc_node qup0_core_master = {
        .name = "qup0_core_master",
-       .id = SC8280XP_MASTER_QUP_CORE_0,
        .channels = 1,
        .buswidth = 4,
        .num_links = 1,
-       .links = { SC8280XP_SLAVE_QUP_CORE_0 },
+       .link_nodes = { &qup0_core_slave },
 };
 
 static struct qcom_icc_node qup1_core_master = {
        .name = "qup1_core_master",
-       .id = SC8280XP_MASTER_QUP_CORE_1,
        .channels = 1,
        .buswidth = 4,
        .num_links = 1,
-       .links = { SC8280XP_SLAVE_QUP_CORE_1 },
+       .link_nodes = { &qup1_core_slave },
 };
 
 static struct qcom_icc_node qup2_core_master = {
        .name = "qup2_core_master",
-       .id = SC8280XP_MASTER_QUP_CORE_2,
        .channels = 1,
        .buswidth = 4,
        .num_links = 1,
-       .links = { SC8280XP_SLAVE_QUP_CORE_2 },
+       .link_nodes = { &qup2_core_slave },
 };
 
 static struct qcom_icc_node qnm_gemnoc_cnoc = {
        .name = "qnm_gemnoc_cnoc",
-       .id = SC8280XP_MASTER_GEM_NOC_CNOC,
        .channels = 1,
        .buswidth = 16,
        .num_links = 76,
-       .links = { SC8280XP_SLAVE_AHB2PHY_0,
-                  SC8280XP_SLAVE_AHB2PHY_1,
-                  SC8280XP_SLAVE_AHB2PHY_2,
-                  SC8280XP_SLAVE_AOSS,
-                  SC8280XP_SLAVE_APPSS,
-                  SC8280XP_SLAVE_CAMERA_CFG,
-                  SC8280XP_SLAVE_CLK_CTL,
-                  SC8280XP_SLAVE_CDSP_CFG,
-                  SC8280XP_SLAVE_CDSP1_CFG,
-                  SC8280XP_SLAVE_RBCPR_CX_CFG,
-                  SC8280XP_SLAVE_RBCPR_MMCX_CFG,
-                  SC8280XP_SLAVE_RBCPR_MX_CFG,
-                  SC8280XP_SLAVE_CPR_NSPCX,
-                  SC8280XP_SLAVE_CRYPTO_0_CFG,
-                  SC8280XP_SLAVE_CX_RDPM,
-                  SC8280XP_SLAVE_DCC_CFG,
-                  SC8280XP_SLAVE_DISPLAY_CFG,
-                  SC8280XP_SLAVE_DISPLAY1_CFG,
-                  SC8280XP_SLAVE_EMAC_CFG,
-                  SC8280XP_SLAVE_EMAC1_CFG,
-                  SC8280XP_SLAVE_GFX3D_CFG,
-                  SC8280XP_SLAVE_HWKM,
-                  SC8280XP_SLAVE_IMEM_CFG,
-                  SC8280XP_SLAVE_IPA_CFG,
-                  SC8280XP_SLAVE_IPC_ROUTER_CFG,
-                  SC8280XP_SLAVE_LPASS,
-                  SC8280XP_SLAVE_MX_RDPM,
-                  SC8280XP_SLAVE_MXC_RDPM,
-                  SC8280XP_SLAVE_PCIE_0_CFG,
-                  SC8280XP_SLAVE_PCIE_1_CFG,
-                  SC8280XP_SLAVE_PCIE_2A_CFG,
-                  SC8280XP_SLAVE_PCIE_2B_CFG,
-                  SC8280XP_SLAVE_PCIE_3A_CFG,
-                  SC8280XP_SLAVE_PCIE_3B_CFG,
-                  SC8280XP_SLAVE_PCIE_4_CFG,
-                  SC8280XP_SLAVE_PCIE_RSC_CFG,
-                  SC8280XP_SLAVE_PDM,
-                  SC8280XP_SLAVE_PIMEM_CFG,
-                  SC8280XP_SLAVE_PKA_WRAPPER_CFG,
-                  SC8280XP_SLAVE_PMU_WRAPPER_CFG,
-                  SC8280XP_SLAVE_QDSS_CFG,
-                  SC8280XP_SLAVE_QSPI_0,
-                  SC8280XP_SLAVE_QUP_0,
-                  SC8280XP_SLAVE_QUP_1,
-                  SC8280XP_SLAVE_QUP_2,
-                  SC8280XP_SLAVE_SDCC_2,
-                  SC8280XP_SLAVE_SDCC_4,
-                  SC8280XP_SLAVE_SECURITY,
-                  SC8280XP_SLAVE_SMMUV3_CFG,
-                  SC8280XP_SLAVE_SMSS_CFG,
-                  SC8280XP_SLAVE_SPSS_CFG,
-                  SC8280XP_SLAVE_TCSR,
-                  SC8280XP_SLAVE_TLMM,
-                  SC8280XP_SLAVE_UFS_CARD_CFG,
-                  SC8280XP_SLAVE_UFS_MEM_CFG,
-                  SC8280XP_SLAVE_USB3_0,
-                  SC8280XP_SLAVE_USB3_1,
-                  SC8280XP_SLAVE_USB3_MP,
-                  SC8280XP_SLAVE_USB4_0,
-                  SC8280XP_SLAVE_USB4_1,
-                  SC8280XP_SLAVE_VENUS_CFG,
-                  SC8280XP_SLAVE_VSENSE_CTRL_CFG,
-                  SC8280XP_SLAVE_VSENSE_CTRL_R_CFG,
-                  SC8280XP_SLAVE_A1NOC_CFG,
-                  SC8280XP_SLAVE_A2NOC_CFG,
-                  SC8280XP_SLAVE_ANOC_PCIE_BRIDGE_CFG,
-                  SC8280XP_SLAVE_DDRSS_CFG,
-                  SC8280XP_SLAVE_CNOC_MNOC_CFG,
-                  SC8280XP_SLAVE_SNOC_CFG,
-                  SC8280XP_SLAVE_SNOC_SF_BRIDGE_CFG,
-                  SC8280XP_SLAVE_IMEM,
-                  SC8280XP_SLAVE_PIMEM,
-                  SC8280XP_SLAVE_SERVICE_CNOC,
-                  SC8280XP_SLAVE_QDSS_STM,
-                  SC8280XP_SLAVE_SMSS,
-                  SC8280XP_SLAVE_TCU
-       },
+       .link_nodes = { &qhs_ahb2phy0,
+                       &qhs_ahb2phy1,
+                       &qhs_ahb2phy2,
+                       &qhs_aoss,
+                       &qhs_apss,
+                       &qhs_camera_cfg,
+                       &qhs_clk_ctl,
+                       &qhs_compute0_cfg,
+                       &qhs_compute1_cfg,
+                       &qhs_cpr_cx,
+                       &qhs_cpr_mmcx,
+                       &qhs_cpr_mx,
+                       &qhs_cpr_nspcx,
+                       &qhs_crypto0_cfg,
+                       &qhs_cx_rdpm,
+                       &qhs_dcc_cfg,
+                       &qhs_display0_cfg,
+                       &qhs_display1_cfg,
+                       &qhs_emac0_cfg,
+                       &qhs_emac1_cfg,
+                       &qhs_gpuss_cfg,
+                       &qhs_hwkm,
+                       &qhs_imem_cfg,
+                       &qhs_ipa,
+                       &qhs_ipc_router,
+                       &qhs_lpass_cfg,
+                       &qhs_mx_rdpm,
+                       &qhs_mxc_rdpm,
+                       &qhs_pcie0_cfg,
+                       &qhs_pcie1_cfg,
+                       &qhs_pcie2a_cfg,
+                       &qhs_pcie2b_cfg,
+                       &qhs_pcie3a_cfg,
+                       &qhs_pcie3b_cfg,
+                       &qhs_pcie4_cfg,
+                       &qhs_pcie_rsc_cfg,
+                       &qhs_pdm,
+                       &qhs_pimem_cfg,
+                       &qhs_pka_wrapper_cfg,
+                       &qhs_pmu_wrapper_cfg,
+                       &qhs_qdss_cfg,
+                       &qhs_qspi,
+                       &qhs_qup0,
+                       &qhs_qup1,
+                       &qhs_qup2,
+                       &qhs_sdc2,
+                       &qhs_sdc4,
+                       &qhs_security,
+                       &qhs_smmuv3_cfg,
+                       &qhs_smss_cfg,
+                       &qhs_spss_cfg,
+                       &qhs_tcsr,
+                       &qhs_tlmm,
+                       &qhs_ufs_card_cfg,
+                       &qhs_ufs_mem_cfg,
+                       &qhs_usb3_0,
+                       &qhs_usb3_1,
+                       &qhs_usb3_mp,
+                       &qhs_usb4_host_0,
+                       &qhs_usb4_host_1,
+                       &qhs_venus_cfg,
+                       &qhs_vsense_ctrl_cfg,
+                       &qhs_vsense_ctrl_r_cfg,
+                       &qns_a1_noc_cfg,
+                       &qns_a2_noc_cfg,
+                       &qns_anoc_pcie_bridge_cfg,
+                       &qns_ddrss_cfg,
+                       &qns_mnoc_cfg,
+                       &qns_snoc_cfg,
+                       &qns_snoc_sf_bridge_cfg,
+                       &qxs_imem,
+                       &qxs_pimem,
+                       &srvc_cnoc,
+                       &xs_qdss_stm,
+                       &xs_smss,
+                       &xs_sys_tcu_cfg,
+                       NULL },
 };
 
 static struct qcom_icc_node qnm_gemnoc_pcie = {
        .name = "qnm_gemnoc_pcie",
-       .id = SC8280XP_MASTER_GEM_NOC_PCIE_SNOC,
        .channels = 1,
        .buswidth = 16,
        .num_links = 7,
-       .links = { SC8280XP_SLAVE_PCIE_0,
-                  SC8280XP_SLAVE_PCIE_1,
-                  SC8280XP_SLAVE_PCIE_2A,
-                  SC8280XP_SLAVE_PCIE_2B,
-                  SC8280XP_SLAVE_PCIE_3A,
-                  SC8280XP_SLAVE_PCIE_3B,
-                  SC8280XP_SLAVE_PCIE_4
-       },
+       .link_nodes = { &xs_pcie_0,
+                       &xs_pcie_1,
+                       &xs_pcie_2a,
+                       &xs_pcie_2b,
+                       &xs_pcie_3a,
+                       &xs_pcie_3b,
+                       &xs_pcie_4 },
 };
 
 static struct qcom_icc_node qnm_cnoc_dc_noc = {
        .name = "qnm_cnoc_dc_noc",
-       .id = SC8280XP_MASTER_CNOC_DC_NOC,
        .channels = 1,
        .buswidth = 4,
        .num_links = 2,
-       .links = { SC8280XP_SLAVE_LLCC_CFG,
-                  SC8280XP_SLAVE_GEM_NOC_CFG
-       },
+       .link_nodes = { &qhs_llcc,
+                       &qns_gemnoc },
 };
 
 static struct qcom_icc_node alm_gpu_tcu = {
        .name = "alm_gpu_tcu",
-       .id = SC8280XP_MASTER_GPU_TCU,
        .channels = 1,
        .buswidth = 8,
        .num_links = 2,
-       .links = { SC8280XP_SLAVE_GEM_NOC_CNOC,
-                  SC8280XP_SLAVE_LLCC
-       },
+       .link_nodes = { &qns_gem_noc_cnoc,
+                       &qns_llcc },
 };
 
 static struct qcom_icc_node alm_pcie_tcu = {
        .name = "alm_pcie_tcu",
-       .id = SC8280XP_MASTER_PCIE_TCU,
        .channels = 1,
        .buswidth = 8,
        .num_links = 2,
-       .links = { SC8280XP_SLAVE_GEM_NOC_CNOC,
-                  SC8280XP_SLAVE_LLCC
-       },
+       .link_nodes = { &qns_gem_noc_cnoc,
+                       &qns_llcc },
 };
 
 static struct qcom_icc_node alm_sys_tcu = {
        .name = "alm_sys_tcu",
-       .id = SC8280XP_MASTER_SYS_TCU,
        .channels = 1,
        .buswidth = 8,
        .num_links = 2,
-       .links = { SC8280XP_SLAVE_GEM_NOC_CNOC,
-                  SC8280XP_SLAVE_LLCC
-       },
+       .link_nodes = { &qns_gem_noc_cnoc,
+                       &qns_llcc },
 };
 
 static struct qcom_icc_node chm_apps = {
        .name = "chm_apps",
-       .id = SC8280XP_MASTER_APPSS_PROC,
        .channels = 2,
        .buswidth = 32,
        .num_links = 3,
-       .links = { SC8280XP_SLAVE_GEM_NOC_CNOC,
-                  SC8280XP_SLAVE_LLCC,
-                  SC8280XP_SLAVE_GEM_NOC_PCIE_CNOC
-       },
+       .link_nodes = { &qns_gem_noc_cnoc,
+                       &qns_llcc,
+                       &qns_pcie },
 };
 
 static struct qcom_icc_node qnm_cmpnoc0 = {
        .name = "qnm_cmpnoc0",
-       .id = SC8280XP_MASTER_COMPUTE_NOC,
        .channels = 2,
        .buswidth = 32,
        .num_links = 2,
-       .links = { SC8280XP_SLAVE_GEM_NOC_CNOC,
-                  SC8280XP_SLAVE_LLCC
-       },
+       .link_nodes = { &qns_gem_noc_cnoc,
+                       &qns_llcc },
 };
 
 static struct qcom_icc_node qnm_cmpnoc1 = {
        .name = "qnm_cmpnoc1",
-       .id = SC8280XP_MASTER_COMPUTE_NOC_1,
        .channels = 2,
        .buswidth = 32,
        .num_links = 2,
-       .links = { SC8280XP_SLAVE_GEM_NOC_CNOC,
-                  SC8280XP_SLAVE_LLCC
-       },
+       .link_nodes = { &qns_gem_noc_cnoc,
+                       &qns_llcc },
 };
 
 static struct qcom_icc_node qnm_gemnoc_cfg = {
        .name = "qnm_gemnoc_cfg",
-       .id = SC8280XP_MASTER_GEM_NOC_CFG,
        .channels = 1,
        .buswidth = 4,
        .num_links = 3,
-       .links = { SC8280XP_SLAVE_SERVICE_GEM_NOC_1,
-                  SC8280XP_SLAVE_SERVICE_GEM_NOC_2,
-                  SC8280XP_SLAVE_SERVICE_GEM_NOC
-       },
+       .link_nodes = { &srvc_even_gemnoc,
+                       &srvc_odd_gemnoc,
+                       &srvc_sys_gemnoc },
 };
 
 static struct qcom_icc_node qnm_gpu = {
        .name = "qnm_gpu",
-       .id = SC8280XP_MASTER_GFX3D,
        .channels = 4,
        .buswidth = 32,
        .num_links = 2,
-       .links = { SC8280XP_SLAVE_GEM_NOC_CNOC,
-                  SC8280XP_SLAVE_LLCC
-       },
+       .link_nodes = { &qns_gem_noc_cnoc,
+                       &qns_llcc },
 };
 
 static struct qcom_icc_node qnm_mnoc_hf = {
        .name = "qnm_mnoc_hf",
-       .id = SC8280XP_MASTER_MNOC_HF_MEM_NOC,
        .channels = 2,
        .buswidth = 32,
        .num_links = 2,
-       .links = { SC8280XP_SLAVE_LLCC,
-                  SC8280XP_SLAVE_GEM_NOC_PCIE_CNOC
-       },
+       .link_nodes = { &qns_llcc,
+                       &qns_pcie },
 };
 
 static struct qcom_icc_node qnm_mnoc_sf = {
        .name = "qnm_mnoc_sf",
-       .id = SC8280XP_MASTER_MNOC_SF_MEM_NOC,
        .channels = 2,
        .buswidth = 32,
        .num_links = 2,
-       .links = { SC8280XP_SLAVE_GEM_NOC_CNOC,
-                  SC8280XP_SLAVE_LLCC
-       },
+       .link_nodes = { &qns_gem_noc_cnoc,
+                       &qns_llcc },
 };
 
 static struct qcom_icc_node qnm_pcie = {
        .name = "qnm_pcie",
-       .id = SC8280XP_MASTER_ANOC_PCIE_GEM_NOC,
        .channels = 1,
        .buswidth = 32,
        .num_links = 2,
-       .links = { SC8280XP_SLAVE_GEM_NOC_CNOC,
-                  SC8280XP_SLAVE_LLCC
-       },
+       .link_nodes = { &qns_gem_noc_cnoc,
+                       &qns_llcc },
 };
 
 static struct qcom_icc_node qnm_snoc_gc = {
        .name = "qnm_snoc_gc",
-       .id = SC8280XP_MASTER_SNOC_GC_MEM_NOC,
        .channels = 1,
        .buswidth = 8,
        .num_links = 1,
-       .links = { SC8280XP_SLAVE_LLCC },
+       .link_nodes = { &qns_llcc },
 };
 
 static struct qcom_icc_node qnm_snoc_sf = {
        .name = "qnm_snoc_sf",
-       .id = SC8280XP_MASTER_SNOC_SF_MEM_NOC,
        .channels = 1,
        .buswidth = 16,
        .num_links = 3,
-       .links = { SC8280XP_SLAVE_GEM_NOC_CNOC,
-                  SC8280XP_SLAVE_LLCC,
-                  SC8280XP_SLAVE_GEM_NOC_PCIE_CNOC },
+       .link_nodes = { &qns_gem_noc_cnoc,
+                       &qns_llcc,
+                       &qns_pcie },
 };
 
 static struct qcom_icc_node qhm_config_noc = {
        .name = "qhm_config_noc",
-       .id = SC8280XP_MASTER_CNOC_LPASS_AG_NOC,
        .channels = 1,
        .buswidth = 4,
        .num_links = 6,
-       .links = { SC8280XP_SLAVE_LPASS_CORE_CFG,
-                  SC8280XP_SLAVE_LPASS_LPI_CFG,
-                  SC8280XP_SLAVE_LPASS_MPU_CFG,
-                  SC8280XP_SLAVE_LPASS_TOP_CFG,
-                  SC8280XP_SLAVE_SERVICES_LPASS_AML_NOC,
-                  SC8280XP_SLAVE_SERVICE_LPASS_AG_NOC
-       },
+       .link_nodes = { &qhs_lpass_core,
+                       &qhs_lpass_lpi,
+                       &qhs_lpass_mpu,
+                       &qhs_lpass_top,
+                       &srvc_niu_aml_noc,
+                       &srvc_niu_lpass_agnoc },
 };
 
 static struct qcom_icc_node qxm_lpass_dsp = {
        .name = "qxm_lpass_dsp",
-       .id = SC8280XP_MASTER_LPASS_PROC,
        .channels = 1,
        .buswidth = 8,
        .num_links = 4,
-       .links = { SC8280XP_SLAVE_LPASS_TOP_CFG,
-                  SC8280XP_SLAVE_LPASS_SNOC,
-                  SC8280XP_SLAVE_SERVICES_LPASS_AML_NOC,
-                  SC8280XP_SLAVE_SERVICE_LPASS_AG_NOC
-       },
+       .link_nodes = { &qhs_lpass_top,
+                       &qns_sysnoc,
+                       &srvc_niu_aml_noc,
+                       &srvc_niu_lpass_agnoc },
 };
 
 static struct qcom_icc_node llcc_mc = {
        .name = "llcc_mc",
-       .id = SC8280XP_MASTER_LLCC,
        .channels = 8,
        .buswidth = 4,
        .num_links = 1,
-       .links = { SC8280XP_SLAVE_EBI1 },
+       .link_nodes = { &ebi },
 };
 
 static struct qcom_icc_node qnm_camnoc_hf = {
        .name = "qnm_camnoc_hf",
-       .id = SC8280XP_MASTER_CAMNOC_HF,
        .channels = 2,
        .buswidth = 32,
        .num_links = 1,
-       .links = { SC8280XP_SLAVE_MNOC_HF_MEM_NOC },
+       .link_nodes = { &qns_mem_noc_hf },
 };
 
 static struct qcom_icc_node qnm_mdp0_0 = {
        .name = "qnm_mdp0_0",
-       .id = SC8280XP_MASTER_MDP0,
        .channels = 1,
        .buswidth = 32,
        .num_links = 1,
-       .links = { SC8280XP_SLAVE_MNOC_HF_MEM_NOC },
+       .link_nodes = { &qns_mem_noc_hf },
 };
 
 static struct qcom_icc_node qnm_mdp0_1 = {
        .name = "qnm_mdp0_1",
-       .id = SC8280XP_MASTER_MDP1,
        .channels = 1,
        .buswidth = 32,
        .num_links = 1,
-       .links = { SC8280XP_SLAVE_MNOC_HF_MEM_NOC },
+       .link_nodes = { &qns_mem_noc_hf },
 };
 
 static struct qcom_icc_node qnm_mdp1_0 = {
        .name = "qnm_mdp1_0",
-       .id = SC8280XP_MASTER_MDP_CORE1_0,
        .channels = 1,
        .buswidth = 32,
        .num_links = 1,
-       .links = { SC8280XP_SLAVE_MNOC_HF_MEM_NOC },
+       .link_nodes = { &qns_mem_noc_hf },
 };
 
 static struct qcom_icc_node qnm_mdp1_1 = {
        .name = "qnm_mdp1_1",
-       .id = SC8280XP_MASTER_MDP_CORE1_1,
        .channels = 1,
        .buswidth = 32,
        .num_links = 1,
-       .links = { SC8280XP_SLAVE_MNOC_HF_MEM_NOC },
+       .link_nodes = { &qns_mem_noc_hf },
 };
 
 static struct qcom_icc_node qnm_mnoc_cfg = {
        .name = "qnm_mnoc_cfg",
-       .id = SC8280XP_MASTER_CNOC_MNOC_CFG,
        .channels = 1,
        .buswidth = 4,
        .num_links = 1,
-       .links = { SC8280XP_SLAVE_SERVICE_MNOC },
+       .link_nodes = { &srvc_mnoc },
 };
 
 static struct qcom_icc_node qnm_rot_0 = {
        .name = "qnm_rot_0",
-       .id = SC8280XP_MASTER_ROTATOR,
        .channels = 1,
        .buswidth = 32,
        .num_links = 1,
-       .links = { SC8280XP_SLAVE_MNOC_SF_MEM_NOC },
+       .link_nodes = { &qns_mem_noc_sf },
 };
 
 static struct qcom_icc_node qnm_rot_1 = {
        .name = "qnm_rot_1",
-       .id = SC8280XP_MASTER_ROTATOR_1,
        .channels = 1,
        .buswidth = 32,
        .num_links = 1,
-       .links = { SC8280XP_SLAVE_MNOC_SF_MEM_NOC },
+       .link_nodes = { &qns_mem_noc_sf },
 };
 
 static struct qcom_icc_node qnm_video0 = {
        .name = "qnm_video0",
-       .id = SC8280XP_MASTER_VIDEO_P0,
        .channels = 1,
        .buswidth = 32,
        .num_links = 1,
-       .links = { SC8280XP_SLAVE_MNOC_SF_MEM_NOC },
+       .link_nodes = { &qns_mem_noc_sf },
 };
 
 static struct qcom_icc_node qnm_video1 = {
        .name = "qnm_video1",
-       .id = SC8280XP_MASTER_VIDEO_P1,
        .channels = 1,
        .buswidth = 32,
        .num_links = 1,
-       .links = { SC8280XP_SLAVE_MNOC_SF_MEM_NOC },
+       .link_nodes = { &qns_mem_noc_sf },
 };
 
 static struct qcom_icc_node qnm_video_cvp = {
        .name = "qnm_video_cvp",
-       .id = SC8280XP_MASTER_VIDEO_PROC,
        .channels = 1,
        .buswidth = 32,
        .num_links = 1,
-       .links = { SC8280XP_SLAVE_MNOC_SF_MEM_NOC },
+       .link_nodes = { &qns_mem_noc_sf },
 };
 
 static struct qcom_icc_node qxm_camnoc_icp = {
        .name = "qxm_camnoc_icp",
-       .id = SC8280XP_MASTER_CAMNOC_ICP,
        .channels = 1,
        .buswidth = 8,
        .num_links = 1,
-       .links = { SC8280XP_SLAVE_MNOC_SF_MEM_NOC },
+       .link_nodes = { &qns_mem_noc_sf },
 };
 
 static struct qcom_icc_node qxm_camnoc_sf = {
        .name = "qxm_camnoc_sf",
-       .id = SC8280XP_MASTER_CAMNOC_SF,
        .channels = 1,
        .buswidth = 32,
        .num_links = 1,
-       .links = { SC8280XP_SLAVE_MNOC_SF_MEM_NOC },
+       .link_nodes = { &qns_mem_noc_sf },
 };
 
 static struct qcom_icc_node qhm_nsp_noc_config = {
        .name = "qhm_nsp_noc_config",
-       .id = SC8280XP_MASTER_CDSP_NOC_CFG,
        .channels = 1,
        .buswidth = 4,
        .num_links = 1,
-       .links = { SC8280XP_SLAVE_SERVICE_NSP_NOC },
+       .link_nodes = { &service_nsp_noc },
 };
 
 static struct qcom_icc_node qxm_nsp = {
        .name = "qxm_nsp",
-       .id = SC8280XP_MASTER_CDSP_PROC,
        .channels = 2,
        .buswidth = 32,
        .num_links = 2,
-       .links = { SC8280XP_SLAVE_CDSP_MEM_NOC,
-                  SC8280XP_SLAVE_NSP_XFR
-       },
+       .link_nodes = { &qns_nsp_gemnoc,
+                       &qxs_nsp_xfr },
 };
 
 static struct qcom_icc_node qhm_nspb_noc_config = {
        .name = "qhm_nspb_noc_config",
-       .id = SC8280XP_MASTER_CDSPB_NOC_CFG,
        .channels = 1,
        .buswidth = 4,
        .num_links = 1,
-       .links = { SC8280XP_SLAVE_SERVICE_NSPB_NOC },
+       .link_nodes = { &service_nspb_noc },
 };
 
 static struct qcom_icc_node qxm_nspb = {
        .name = "qxm_nspb",
-       .id = SC8280XP_MASTER_CDSP_PROC_B,
        .channels = 2,
        .buswidth = 32,
        .num_links = 2,
-       .links = { SC8280XP_SLAVE_CDSPB_MEM_NOC,
-                  SC8280XP_SLAVE_NSPB_XFR
-       },
+       .link_nodes = { &qns_nspb_gemnoc,
+                       &qxs_nspb_xfr },
 };
 
 static struct qcom_icc_node qnm_aggre1_noc = {
        .name = "qnm_aggre1_noc",
-       .id = SC8280XP_MASTER_A1NOC_SNOC,
        .channels = 1,
        .buswidth = 16,
        .num_links = 1,
-       .links = { SC8280XP_SLAVE_SNOC_GEM_NOC_SF },
+       .link_nodes = { &qns_gemnoc_sf },
 };
 
 static struct qcom_icc_node qnm_aggre2_noc = {
        .name = "qnm_aggre2_noc",
-       .id = SC8280XP_MASTER_A2NOC_SNOC,
        .channels = 1,
        .buswidth = 16,
        .num_links = 1,
-       .links = { SC8280XP_SLAVE_SNOC_GEM_NOC_SF },
+       .link_nodes = { &qns_gemnoc_sf },
 };
 
 static struct qcom_icc_node qnm_aggre_usb_noc = {
        .name = "qnm_aggre_usb_noc",
-       .id = SC8280XP_MASTER_USB_NOC_SNOC,
        .channels = 1,
        .buswidth = 16,
        .num_links = 1,
-       .links = { SC8280XP_SLAVE_SNOC_GEM_NOC_SF },
+       .link_nodes = { &qns_gemnoc_sf },
 };
 
 static struct qcom_icc_node qnm_lpass_noc = {
        .name = "qnm_lpass_noc",
-       .id = SC8280XP_MASTER_LPASS_ANOC,
        .channels = 1,
        .buswidth = 16,
        .num_links = 1,
-       .links = { SC8280XP_SLAVE_SNOC_GEM_NOC_SF },
+       .link_nodes = { &qns_gemnoc_sf },
 };
 
 static struct qcom_icc_node qnm_snoc_cfg = {
        .name = "qnm_snoc_cfg",
-       .id = SC8280XP_MASTER_SNOC_CFG,
        .channels = 1,
        .buswidth = 4,
        .num_links = 1,
-       .links = { SC8280XP_SLAVE_SERVICE_SNOC },
+       .link_nodes = { &srvc_snoc },
 };
 
 static struct qcom_icc_node qxm_pimem = {
        .name = "qxm_pimem",
-       .id = SC8280XP_MASTER_PIMEM,
        .channels = 1,
        .buswidth = 8,
        .num_links = 1,
-       .links = { SC8280XP_SLAVE_SNOC_GEM_NOC_GC },
+       .link_nodes = { &qns_gemnoc_gc },
 };
 
 static struct qcom_icc_node xm_gic = {
        .name = "xm_gic",
-       .id = SC8280XP_MASTER_GIC,
        .channels = 1,
        .buswidth = 8,
        .num_links = 1,
-       .links = { SC8280XP_SLAVE_SNOC_GEM_NOC_GC },
+       .link_nodes = { &qns_gemnoc_gc },
 };
 
 static struct qcom_icc_node qns_a1noc_snoc = {
        .name = "qns_a1noc_snoc",
-       .id = SC8280XP_SLAVE_A1NOC_SNOC,
        .channels = 1,
        .buswidth = 16,
        .num_links = 1,
-       .links = { SC8280XP_MASTER_A1NOC_SNOC },
+       .link_nodes = { &qnm_aggre1_noc },
 };
 
 static struct qcom_icc_node qns_aggre_usb_snoc = {
        .name = "qns_aggre_usb_snoc",
-       .id = SC8280XP_SLAVE_USB_NOC_SNOC,
        .channels = 1,
        .buswidth = 16,
        .num_links = 1,
-       .links = { SC8280XP_MASTER_USB_NOC_SNOC },
+       .link_nodes = { &qnm_aggre_usb_noc },
 };
 
 static struct qcom_icc_node srvc_aggre1_noc = {
        .name = "srvc_aggre1_noc",
-       .id = SC8280XP_SLAVE_SERVICE_A1NOC,
        .channels = 1,
        .buswidth = 4,
 };
 
 static struct qcom_icc_node qns_a2noc_snoc = {
        .name = "qns_a2noc_snoc",
-       .id = SC8280XP_SLAVE_A2NOC_SNOC,
        .channels = 1,
        .buswidth = 16,
        .num_links = 1,
-       .links = { SC8280XP_MASTER_A2NOC_SNOC },
+       .link_nodes = { &qnm_aggre2_noc },
 };
 
 static struct qcom_icc_node qns_pcie_gem_noc = {
        .name = "qns_pcie_gem_noc",
-       .id = SC8280XP_SLAVE_ANOC_PCIE_GEM_NOC,
        .channels = 1,
        .buswidth = 32,
        .num_links = 1,
-       .links = { SC8280XP_MASTER_ANOC_PCIE_GEM_NOC },
+       .link_nodes = { &qnm_pcie },
 };
 
 static struct qcom_icc_node srvc_aggre2_noc = {
        .name = "srvc_aggre2_noc",
-       .id = SC8280XP_SLAVE_SERVICE_A2NOC,
        .channels = 1,
        .buswidth = 4,
 };
 
 static struct qcom_icc_node qup0_core_slave = {
        .name = "qup0_core_slave",
-       .id = SC8280XP_SLAVE_QUP_CORE_0,
        .channels = 1,
        .buswidth = 4,
 };
 
 static struct qcom_icc_node qup1_core_slave = {
        .name = "qup1_core_slave",
-       .id = SC8280XP_SLAVE_QUP_CORE_1,
        .channels = 1,
        .buswidth = 4,
 };
 
 static struct qcom_icc_node qup2_core_slave = {
        .name = "qup2_core_slave",
-       .id = SC8280XP_SLAVE_QUP_CORE_2,
        .channels = 1,
        .buswidth = 4,
 };
 
 static struct qcom_icc_node qhs_ahb2phy0 = {
        .name = "qhs_ahb2phy0",
-       .id = SC8280XP_SLAVE_AHB2PHY_0,
        .channels = 1,
        .buswidth = 4,
 };
 
 static struct qcom_icc_node qhs_ahb2phy1 = {
        .name = "qhs_ahb2phy1",
-       .id = SC8280XP_SLAVE_AHB2PHY_1,
        .channels = 1,
        .buswidth = 4,
 };
 
 static struct qcom_icc_node qhs_ahb2phy2 = {
        .name = "qhs_ahb2phy2",
-       .id = SC8280XP_SLAVE_AHB2PHY_2,
        .channels = 1,
        .buswidth = 4,
 };
 
 static struct qcom_icc_node qhs_aoss = {
        .name = "qhs_aoss",
-       .id = SC8280XP_SLAVE_AOSS,
        .channels = 1,
        .buswidth = 4,
 };
 
 static struct qcom_icc_node qhs_apss = {
        .name = "qhs_apss",
-       .id = SC8280XP_SLAVE_APPSS,
        .channels = 1,
        .buswidth = 8,
 };
 
 static struct qcom_icc_node qhs_camera_cfg = {
        .name = "qhs_camera_cfg",
-       .id = SC8280XP_SLAVE_CAMERA_CFG,
        .channels = 1,
        .buswidth = 4,
 };
 
 static struct qcom_icc_node qhs_clk_ctl = {
        .name = "qhs_clk_ctl",
-       .id = SC8280XP_SLAVE_CLK_CTL,
        .channels = 1,
        .buswidth = 4,
 };
 
 static struct qcom_icc_node qhs_compute0_cfg = {
        .name = "qhs_compute0_cfg",
-       .id = SC8280XP_SLAVE_CDSP_CFG,
        .channels = 1,
        .buswidth = 4,
        .num_links = 1,
-       .links = { SC8280XP_MASTER_CDSP_NOC_CFG },
+       .link_nodes = { &qhm_nsp_noc_config },
 };
 
 static struct qcom_icc_node qhs_compute1_cfg = {
        .name = "qhs_compute1_cfg",
-       .id = SC8280XP_SLAVE_CDSP1_CFG,
        .channels = 1,
        .buswidth = 4,
        .num_links = 1,
-       .links = { SC8280XP_MASTER_CDSPB_NOC_CFG },
+       .link_nodes = { &qhm_nspb_noc_config },
 };
 
 static struct qcom_icc_node qhs_cpr_cx = {
        .name = "qhs_cpr_cx",
-       .id = SC8280XP_SLAVE_RBCPR_CX_CFG,
        .channels = 1,
        .buswidth = 4,
 };
 
 static struct qcom_icc_node qhs_cpr_mmcx = {
        .name = "qhs_cpr_mmcx",
-       .id = SC8280XP_SLAVE_RBCPR_MMCX_CFG,
        .channels = 1,
        .buswidth = 4,
 };
 
 static struct qcom_icc_node qhs_cpr_mx = {
        .name = "qhs_cpr_mx",
-       .id = SC8280XP_SLAVE_RBCPR_MX_CFG,
        .channels = 1,
        .buswidth = 4,
 };
 
 static struct qcom_icc_node qhs_cpr_nspcx = {
        .name = "qhs_cpr_nspcx",
-       .id = SC8280XP_SLAVE_CPR_NSPCX,
        .channels = 1,
        .buswidth = 4,
 };
 
 static struct qcom_icc_node qhs_crypto0_cfg = {
        .name = "qhs_crypto0_cfg",
-       .id = SC8280XP_SLAVE_CRYPTO_0_CFG,
        .channels = 1,
        .buswidth = 4,
 };
 
 static struct qcom_icc_node qhs_cx_rdpm = {
        .name = "qhs_cx_rdpm",
-       .id = SC8280XP_SLAVE_CX_RDPM,
        .channels = 1,
        .buswidth = 4,
 };
 
 static struct qcom_icc_node qhs_dcc_cfg = {
        .name = "qhs_dcc_cfg",
-       .id = SC8280XP_SLAVE_DCC_CFG,
        .channels = 1,
        .buswidth = 4,
 };
 
 static struct qcom_icc_node qhs_display0_cfg = {
        .name = "qhs_display0_cfg",
-       .id = SC8280XP_SLAVE_DISPLAY_CFG,
        .channels = 1,
        .buswidth = 4,
 };
 
 static struct qcom_icc_node qhs_display1_cfg = {
        .name = "qhs_display1_cfg",
-       .id = SC8280XP_SLAVE_DISPLAY1_CFG,
        .channels = 1,
        .buswidth = 4,
 };
 
 static struct qcom_icc_node qhs_emac0_cfg = {
        .name = "qhs_emac0_cfg",
-       .id = SC8280XP_SLAVE_EMAC_CFG,
        .channels = 1,
        .buswidth = 4,
 };
 
 static struct qcom_icc_node qhs_emac1_cfg = {
        .name = "qhs_emac1_cfg",
-       .id = SC8280XP_SLAVE_EMAC1_CFG,
        .channels = 1,
        .buswidth = 4,
 };
 
 static struct qcom_icc_node qhs_gpuss_cfg = {
        .name = "qhs_gpuss_cfg",
-       .id = SC8280XP_SLAVE_GFX3D_CFG,
        .channels = 1,
        .buswidth = 8,
 };
 
 static struct qcom_icc_node qhs_hwkm = {
        .name = "qhs_hwkm",
-       .id = SC8280XP_SLAVE_HWKM,
        .channels = 1,
        .buswidth = 4,
 };
 
 static struct qcom_icc_node qhs_imem_cfg = {
        .name = "qhs_imem_cfg",
-       .id = SC8280XP_SLAVE_IMEM_CFG,
        .channels = 1,
        .buswidth = 4,
 };
 
 static struct qcom_icc_node qhs_ipa = {
        .name = "qhs_ipa",
-       .id = SC8280XP_SLAVE_IPA_CFG,
        .channels = 1,
        .buswidth = 4,
 };
 
 static struct qcom_icc_node qhs_ipc_router = {
        .name = "qhs_ipc_router",
-       .id = SC8280XP_SLAVE_IPC_ROUTER_CFG,
        .channels = 1,
        .buswidth = 4,
 };
 
 static struct qcom_icc_node qhs_lpass_cfg = {
        .name = "qhs_lpass_cfg",
-       .id = SC8280XP_SLAVE_LPASS,
        .channels = 1,
        .buswidth = 4,
        .num_links = 1,
-       .links = { SC8280XP_MASTER_CNOC_LPASS_AG_NOC },
+       .link_nodes = { &qhm_config_noc },
 };
 
 static struct qcom_icc_node qhs_mx_rdpm = {
        .name = "qhs_mx_rdpm",
-       .id = SC8280XP_SLAVE_MX_RDPM,
        .channels = 1,
        .buswidth = 4,
 };
 
 static struct qcom_icc_node qhs_mxc_rdpm = {
        .name = "qhs_mxc_rdpm",
-       .id = SC8280XP_SLAVE_MXC_RDPM,
        .channels = 1,
        .buswidth = 4,
 };
 
 static struct qcom_icc_node qhs_pcie0_cfg = {
        .name = "qhs_pcie0_cfg",
-       .id = SC8280XP_SLAVE_PCIE_0_CFG,
        .channels = 1,
        .buswidth = 4,
 };
 
 static struct qcom_icc_node qhs_pcie1_cfg = {
        .name = "qhs_pcie1_cfg",
-       .id = SC8280XP_SLAVE_PCIE_1_CFG,
        .channels = 1,
        .buswidth = 4,
 };
 
 static struct qcom_icc_node qhs_pcie2a_cfg = {
        .name = "qhs_pcie2a_cfg",
-       .id = SC8280XP_SLAVE_PCIE_2A_CFG,
        .channels = 1,
        .buswidth = 4,
 };
 
 static struct qcom_icc_node qhs_pcie2b_cfg = {
        .name = "qhs_pcie2b_cfg",
-       .id = SC8280XP_SLAVE_PCIE_2B_CFG,
        .channels = 1,
        .buswidth = 4,
 };
 
 static struct qcom_icc_node qhs_pcie3a_cfg = {
        .name = "qhs_pcie3a_cfg",
-       .id = SC8280XP_SLAVE_PCIE_3A_CFG,
        .channels = 1,
        .buswidth = 4,
 };
 
 static struct qcom_icc_node qhs_pcie3b_cfg = {
        .name = "qhs_pcie3b_cfg",
-       .id = SC8280XP_SLAVE_PCIE_3B_CFG,
        .channels = 1,
        .buswidth = 4,
 };
 
 static struct qcom_icc_node qhs_pcie4_cfg = {
        .name = "qhs_pcie4_cfg",
-       .id = SC8280XP_SLAVE_PCIE_4_CFG,
        .channels = 1,
        .buswidth = 4,
 };
 
 static struct qcom_icc_node qhs_pcie_rsc_cfg = {
        .name = "qhs_pcie_rsc_cfg",
-       .id = SC8280XP_SLAVE_PCIE_RSC_CFG,
        .channels = 1,
        .buswidth = 4,
 };
 
 static struct qcom_icc_node qhs_pdm = {
        .name = "qhs_pdm",
-       .id = SC8280XP_SLAVE_PDM,
        .channels = 1,
        .buswidth = 4,
 };
 
 static struct qcom_icc_node qhs_pimem_cfg = {
        .name = "qhs_pimem_cfg",
-       .id = SC8280XP_SLAVE_PIMEM_CFG,
        .channels = 1,
        .buswidth = 4,
 };
 
 static struct qcom_icc_node qhs_pka_wrapper_cfg = {
        .name = "qhs_pka_wrapper_cfg",
-       .id = SC8280XP_SLAVE_PKA_WRAPPER_CFG,
        .channels = 1,
        .buswidth = 4,
 };
 
 static struct qcom_icc_node qhs_pmu_wrapper_cfg = {
        .name = "qhs_pmu_wrapper_cfg",
-       .id = SC8280XP_SLAVE_PMU_WRAPPER_CFG,
        .channels = 1,
        .buswidth = 4,
 };
 
 static struct qcom_icc_node qhs_qdss_cfg = {
        .name = "qhs_qdss_cfg",
-       .id = SC8280XP_SLAVE_QDSS_CFG,
        .channels = 1,
        .buswidth = 4,
 };
 
 static struct qcom_icc_node qhs_qspi = {
        .name = "qhs_qspi",
-       .id = SC8280XP_SLAVE_QSPI_0,
        .channels = 1,
        .buswidth = 4,
 };
 
 static struct qcom_icc_node qhs_qup0 = {
        .name = "qhs_qup0",
-       .id = SC8280XP_SLAVE_QUP_0,
        .channels = 1,
        .buswidth = 4,
 };
 
 static struct qcom_icc_node qhs_qup1 = {
        .name = "qhs_qup1",
-       .id = SC8280XP_SLAVE_QUP_1,
        .channels = 1,
        .buswidth = 4,
 };
 
 static struct qcom_icc_node qhs_qup2 = {
        .name = "qhs_qup2",
-       .id = SC8280XP_SLAVE_QUP_2,
        .channels = 1,
        .buswidth = 4,
 };
 
 static struct qcom_icc_node qhs_sdc2 = {
        .name = "qhs_sdc2",
-       .id = SC8280XP_SLAVE_SDCC_2,
        .channels = 1,
        .buswidth = 4,
 };
 
 static struct qcom_icc_node qhs_sdc4 = {
        .name = "qhs_sdc4",
-       .id = SC8280XP_SLAVE_SDCC_4,
        .channels = 1,
        .buswidth = 4,
 };
 
 static struct qcom_icc_node qhs_security = {
        .name = "qhs_security",
-       .id = SC8280XP_SLAVE_SECURITY,
        .channels = 1,
        .buswidth = 4,
 };
 
 static struct qcom_icc_node qhs_smmuv3_cfg = {
        .name = "qhs_smmuv3_cfg",
-       .id = SC8280XP_SLAVE_SMMUV3_CFG,
        .channels = 1,
        .buswidth = 8,
 };
 
 static struct qcom_icc_node qhs_smss_cfg = {
        .name = "qhs_smss_cfg",
-       .id = SC8280XP_SLAVE_SMSS_CFG,
        .channels = 1,
        .buswidth = 4,
 };
 
 static struct qcom_icc_node qhs_spss_cfg = {
        .name = "qhs_spss_cfg",
-       .id = SC8280XP_SLAVE_SPSS_CFG,
        .channels = 1,
        .buswidth = 4,
 };
 
 static struct qcom_icc_node qhs_tcsr = {
        .name = "qhs_tcsr",
-       .id = SC8280XP_SLAVE_TCSR,
        .channels = 1,
        .buswidth = 4,
 };
 
 static struct qcom_icc_node qhs_tlmm = {
        .name = "qhs_tlmm",
-       .id = SC8280XP_SLAVE_TLMM,
        .channels = 1,
        .buswidth = 4,
 };
 
 static struct qcom_icc_node qhs_ufs_card_cfg = {
        .name = "qhs_ufs_card_cfg",
-       .id = SC8280XP_SLAVE_UFS_CARD_CFG,
        .channels = 1,
        .buswidth = 4,
 };
 
 static struct qcom_icc_node qhs_ufs_mem_cfg = {
        .name = "qhs_ufs_mem_cfg",
-       .id = SC8280XP_SLAVE_UFS_MEM_CFG,
        .channels = 1,
        .buswidth = 4,
 };
 
 static struct qcom_icc_node qhs_usb3_0 = {
        .name = "qhs_usb3_0",
-       .id = SC8280XP_SLAVE_USB3_0,
        .channels = 1,
        .buswidth = 4,
 };
 
 static struct qcom_icc_node qhs_usb3_1 = {
        .name = "qhs_usb3_1",
-       .id = SC8280XP_SLAVE_USB3_1,
        .channels = 1,
        .buswidth = 4,
 };
 
 static struct qcom_icc_node qhs_usb3_mp = {
        .name = "qhs_usb3_mp",
-       .id = SC8280XP_SLAVE_USB3_MP,
        .channels = 1,
        .buswidth = 4,
 };
 
 static struct qcom_icc_node qhs_usb4_host_0 = {
        .name = "qhs_usb4_host_0",
-       .id = SC8280XP_SLAVE_USB4_0,
        .channels = 1,
        .buswidth = 4,
 };
 
 static struct qcom_icc_node qhs_usb4_host_1 = {
        .name = "qhs_usb4_host_1",
-       .id = SC8280XP_SLAVE_USB4_1,
        .channels = 1,
        .buswidth = 4,
 };
 
 static struct qcom_icc_node qhs_venus_cfg = {
        .name = "qhs_venus_cfg",
-       .id = SC8280XP_SLAVE_VENUS_CFG,
        .channels = 1,
        .buswidth = 4,
 };
 
 static struct qcom_icc_node qhs_vsense_ctrl_cfg = {
        .name = "qhs_vsense_ctrl_cfg",
-       .id = SC8280XP_SLAVE_VSENSE_CTRL_CFG,
        .channels = 1,
        .buswidth = 4,
 };
 
 static struct qcom_icc_node qhs_vsense_ctrl_r_cfg = {
        .name = "qhs_vsense_ctrl_r_cfg",
-       .id = SC8280XP_SLAVE_VSENSE_CTRL_R_CFG,
        .channels = 1,
        .buswidth = 4,
 };
 
 static struct qcom_icc_node qns_a1_noc_cfg = {
        .name = "qns_a1_noc_cfg",
-       .id = SC8280XP_SLAVE_A1NOC_CFG,
        .channels = 1,
        .buswidth = 4,
        .num_links = 1,
-       .links = { SC8280XP_MASTER_A1NOC_CFG },
+       .link_nodes = { &qnm_a1noc_cfg },
 };
 
 static struct qcom_icc_node qns_a2_noc_cfg = {
        .name = "qns_a2_noc_cfg",
-       .id = SC8280XP_SLAVE_A2NOC_CFG,
        .channels = 1,
        .buswidth = 4,
        .num_links = 1,
-       .links = { SC8280XP_MASTER_A2NOC_CFG },
+       .link_nodes = { &qnm_a2noc_cfg },
 };
 
 static struct qcom_icc_node qns_anoc_pcie_bridge_cfg = {
        .name = "qns_anoc_pcie_bridge_cfg",
-       .id = SC8280XP_SLAVE_ANOC_PCIE_BRIDGE_CFG,
        .channels = 1,
        .buswidth = 4,
 };
 
 static struct qcom_icc_node qns_ddrss_cfg = {
        .name = "qns_ddrss_cfg",
-       .id = SC8280XP_SLAVE_DDRSS_CFG,
        .channels = 1,
        .buswidth = 4,
        .num_links = 1,
-       .links = { SC8280XP_MASTER_CNOC_DC_NOC },
+       .link_nodes = { &qnm_cnoc_dc_noc },
 };
 
 static struct qcom_icc_node qns_mnoc_cfg = {
        .name = "qns_mnoc_cfg",
-       .id = SC8280XP_SLAVE_CNOC_MNOC_CFG,
        .channels = 1,
        .buswidth = 4,
        .num_links = 1,
-       .links = { SC8280XP_MASTER_CNOC_MNOC_CFG },
+       .link_nodes = { &qnm_mnoc_cfg },
 };
 
 static struct qcom_icc_node qns_snoc_cfg = {
        .name = "qns_snoc_cfg",
-       .id = SC8280XP_SLAVE_SNOC_CFG,
        .channels = 1,
        .buswidth = 4,
        .num_links = 1,
-       .links = { SC8280XP_MASTER_SNOC_CFG },
+       .link_nodes = { &qnm_snoc_cfg },
 };
 
 static struct qcom_icc_node qns_snoc_sf_bridge_cfg = {
        .name = "qns_snoc_sf_bridge_cfg",
-       .id = SC8280XP_SLAVE_SNOC_SF_BRIDGE_CFG,
        .channels = 1,
        .buswidth = 4,
 };
 
 static struct qcom_icc_node qxs_imem = {
        .name = "qxs_imem",
-       .id = SC8280XP_SLAVE_IMEM,
        .channels = 1,
        .buswidth = 8,
 };
 
 static struct qcom_icc_node qxs_pimem = {
        .name = "qxs_pimem",
-       .id = SC8280XP_SLAVE_PIMEM,
        .channels = 1,
        .buswidth = 8,
 };
 
 static struct qcom_icc_node srvc_cnoc = {
        .name = "srvc_cnoc",
-       .id = SC8280XP_SLAVE_SERVICE_CNOC,
        .channels = 1,
        .buswidth = 4,
 };
 
 static struct qcom_icc_node xs_pcie_0 = {
        .name = "xs_pcie_0",
-       .id = SC8280XP_SLAVE_PCIE_0,
        .channels = 1,
        .buswidth = 16,
 };
 
 static struct qcom_icc_node xs_pcie_1 = {
        .name = "xs_pcie_1",
-       .id = SC8280XP_SLAVE_PCIE_1,
        .channels = 1,
        .buswidth = 16,
 };
 
 static struct qcom_icc_node xs_pcie_2a = {
        .name = "xs_pcie_2a",
-       .id = SC8280XP_SLAVE_PCIE_2A,
        .channels = 1,
        .buswidth = 16,
 };
 
 static struct qcom_icc_node xs_pcie_2b = {
        .name = "xs_pcie_2b",
-       .id = SC8280XP_SLAVE_PCIE_2B,
        .channels = 1,
        .buswidth = 8,
 };
 
 static struct qcom_icc_node xs_pcie_3a = {
        .name = "xs_pcie_3a",
-       .id = SC8280XP_SLAVE_PCIE_3A,
        .channels = 1,
        .buswidth = 16,
 };
 
 static struct qcom_icc_node xs_pcie_3b = {
        .name = "xs_pcie_3b",
-       .id = SC8280XP_SLAVE_PCIE_3B,
        .channels = 1,
        .buswidth = 8,
 };
 
 static struct qcom_icc_node xs_pcie_4 = {
        .name = "xs_pcie_4",
-       .id = SC8280XP_SLAVE_PCIE_4,
        .channels = 1,
        .buswidth = 8,
 };
 
 static struct qcom_icc_node xs_qdss_stm = {
        .name = "xs_qdss_stm",
-       .id = SC8280XP_SLAVE_QDSS_STM,
        .channels = 1,
        .buswidth = 4,
 };
 
 static struct qcom_icc_node xs_smss = {
        .name = "xs_smss",
-       .id = SC8280XP_SLAVE_SMSS,
        .channels = 1,
        .buswidth = 8,
 };
 
 static struct qcom_icc_node xs_sys_tcu_cfg = {
        .name = "xs_sys_tcu_cfg",
-       .id = SC8280XP_SLAVE_TCU,
        .channels = 1,
        .buswidth = 8,
 };
 
 static struct qcom_icc_node qhs_llcc = {
        .name = "qhs_llcc",
-       .id = SC8280XP_SLAVE_LLCC_CFG,
        .channels = 1,
        .buswidth = 4,
 };
 
 static struct qcom_icc_node qns_gemnoc = {
        .name = "qns_gemnoc",
-       .id = SC8280XP_SLAVE_GEM_NOC_CFG,
        .channels = 1,
        .buswidth = 4,
        .num_links = 1,
-       .links = { SC8280XP_MASTER_GEM_NOC_CFG },
+       .link_nodes = { &qnm_gemnoc_cfg },
 };
 
 static struct qcom_icc_node qns_gem_noc_cnoc = {
        .name = "qns_gem_noc_cnoc",
-       .id = SC8280XP_SLAVE_GEM_NOC_CNOC,
        .channels = 1,
        .buswidth = 16,
        .num_links = 1,
-       .links = { SC8280XP_MASTER_GEM_NOC_CNOC },
+       .link_nodes = { &qnm_gemnoc_cnoc },
 };
 
 static struct qcom_icc_node qns_llcc = {
        .name = "qns_llcc",
-       .id = SC8280XP_SLAVE_LLCC,
        .channels = 8,
        .buswidth = 16,
        .num_links = 1,
-       .links = { SC8280XP_MASTER_LLCC },
+       .link_nodes = { &llcc_mc },
 };
 
 static struct qcom_icc_node qns_pcie = {
        .name = "qns_pcie",
-       .id = SC8280XP_SLAVE_GEM_NOC_PCIE_CNOC,
        .channels = 1,
        .buswidth = 16,
        .num_links = 1,
-       .links = { SC8280XP_MASTER_GEM_NOC_PCIE_SNOC },
+       .link_nodes = { &qnm_gemnoc_pcie },
 };
 
 static struct qcom_icc_node srvc_even_gemnoc = {
        .name = "srvc_even_gemnoc",
-       .id = SC8280XP_SLAVE_SERVICE_GEM_NOC_1,
        .channels = 1,
        .buswidth = 4,
 };
 
 static struct qcom_icc_node srvc_odd_gemnoc = {
        .name = "srvc_odd_gemnoc",
-       .id = SC8280XP_SLAVE_SERVICE_GEM_NOC_2,
        .channels = 1,
        .buswidth = 4,
 };
 
 static struct qcom_icc_node srvc_sys_gemnoc = {
        .name = "srvc_sys_gemnoc",
-       .id = SC8280XP_SLAVE_SERVICE_GEM_NOC,
        .channels = 1,
        .buswidth = 4,
 };
 
 static struct qcom_icc_node qhs_lpass_core = {
        .name = "qhs_lpass_core",
-       .id = SC8280XP_SLAVE_LPASS_CORE_CFG,
        .channels = 1,
        .buswidth = 4,
 };
 
 static struct qcom_icc_node qhs_lpass_lpi = {
        .name = "qhs_lpass_lpi",
-       .id = SC8280XP_SLAVE_LPASS_LPI_CFG,
        .channels = 1,
        .buswidth = 4,
 };
 
 static struct qcom_icc_node qhs_lpass_mpu = {
        .name = "qhs_lpass_mpu",
-       .id = SC8280XP_SLAVE_LPASS_MPU_CFG,
        .channels = 1,
        .buswidth = 4,
 };
 
 static struct qcom_icc_node qhs_lpass_top = {
        .name = "qhs_lpass_top",
-       .id = SC8280XP_SLAVE_LPASS_TOP_CFG,
        .channels = 1,
        .buswidth = 4,
 };
 
 static struct qcom_icc_node qns_sysnoc = {
        .name = "qns_sysnoc",
-       .id = SC8280XP_SLAVE_LPASS_SNOC,
        .channels = 1,
        .buswidth = 16,
        .num_links = 1,
-       .links = { SC8280XP_MASTER_LPASS_ANOC },
+       .link_nodes = { &qnm_lpass_noc },
 };
 
 static struct qcom_icc_node srvc_niu_aml_noc = {
        .name = "srvc_niu_aml_noc",
-       .id = SC8280XP_SLAVE_SERVICES_LPASS_AML_NOC,
        .channels = 1,
        .buswidth = 4,
 };
 
 static struct qcom_icc_node srvc_niu_lpass_agnoc = {
        .name = "srvc_niu_lpass_agnoc",
-       .id = SC8280XP_SLAVE_SERVICE_LPASS_AG_NOC,
        .channels = 1,
        .buswidth = 4,
 };
 
 static struct qcom_icc_node ebi = {
        .name = "ebi",
-       .id = SC8280XP_SLAVE_EBI1,
        .channels = 8,
        .buswidth = 4,
 };
 
 static struct qcom_icc_node qns_mem_noc_hf = {
        .name = "qns_mem_noc_hf",
-       .id = SC8280XP_SLAVE_MNOC_HF_MEM_NOC,
        .channels = 2,
        .buswidth = 32,
        .num_links = 1,
-       .links = { SC8280XP_MASTER_MNOC_HF_MEM_NOC },
+       .link_nodes = { &qnm_mnoc_hf },
 };
 
 static struct qcom_icc_node qns_mem_noc_sf = {
        .name = "qns_mem_noc_sf",
-       .id = SC8280XP_SLAVE_MNOC_SF_MEM_NOC,
        .channels = 2,
        .buswidth = 32,
        .num_links = 1,
-       .links = { SC8280XP_MASTER_MNOC_SF_MEM_NOC },
+       .link_nodes = { &qnm_mnoc_sf },
 };
 
 static struct qcom_icc_node srvc_mnoc = {
        .name = "srvc_mnoc",
-       .id = SC8280XP_SLAVE_SERVICE_MNOC,
        .channels = 1,
        .buswidth = 4,
 };
 
 static struct qcom_icc_node qns_nsp_gemnoc = {
        .name = "qns_nsp_gemnoc",
-       .id = SC8280XP_SLAVE_CDSP_MEM_NOC,
        .channels = 2,
        .buswidth = 32,
        .num_links = 1,
-       .links = { SC8280XP_MASTER_COMPUTE_NOC },
+       .link_nodes = { &qnm_cmpnoc0 },
 };
 
 static struct qcom_icc_node qxs_nsp_xfr = {
        .name = "qxs_nsp_xfr",
-       .id = SC8280XP_SLAVE_NSP_XFR,
        .channels = 1,
        .buswidth = 32,
 };
 
 static struct qcom_icc_node service_nsp_noc = {
        .name = "service_nsp_noc",
-       .id = SC8280XP_SLAVE_SERVICE_NSP_NOC,
        .channels = 1,
        .buswidth = 4,
 };
 
 static struct qcom_icc_node qns_nspb_gemnoc = {
        .name = "qns_nspb_gemnoc",
-       .id = SC8280XP_SLAVE_CDSPB_MEM_NOC,
        .channels = 2,
        .buswidth = 32,
        .num_links = 1,
-       .links = { SC8280XP_MASTER_COMPUTE_NOC_1 },
+       .link_nodes = { &qnm_cmpnoc1 },
 };
 
 static struct qcom_icc_node qxs_nspb_xfr = {
        .name = "qxs_nspb_xfr",
-       .id = SC8280XP_SLAVE_NSPB_XFR,
        .channels = 1,
        .buswidth = 32,
 };
 
 static struct qcom_icc_node service_nspb_noc = {
        .name = "service_nspb_noc",
-       .id = SC8280XP_SLAVE_SERVICE_NSPB_NOC,
        .channels = 1,
        .buswidth = 4,
 };
 
 static struct qcom_icc_node qns_gemnoc_gc = {
        .name = "qns_gemnoc_gc",
-       .id = SC8280XP_SLAVE_SNOC_GEM_NOC_GC,
        .channels = 1,
        .buswidth = 8,
        .num_links = 1,
-       .links = { SC8280XP_MASTER_SNOC_GC_MEM_NOC },
+       .link_nodes = { &qnm_snoc_gc },
 };
 
 static struct qcom_icc_node qns_gemnoc_sf = {
        .name = "qns_gemnoc_sf",
-       .id = SC8280XP_SLAVE_SNOC_GEM_NOC_SF,
        .channels = 1,
        .buswidth = 16,
        .num_links = 1,
-       .links = { SC8280XP_MASTER_SNOC_SF_MEM_NOC },
+       .link_nodes = { &qnm_snoc_sf },
 };
 
 static struct qcom_icc_node srvc_snoc = {
        .name = "srvc_snoc",
-       .id = SC8280XP_SLAVE_SERVICE_SNOC,
        .channels = 1,
        .buswidth = 4,
 };
@@ -2015,6 +1998,7 @@ static struct qcom_icc_node * const aggre1_noc_nodes[] = {
 };
 
 static const struct qcom_icc_desc sc8280xp_aggre1_noc = {
+       .alloc_dyn_id = true,
        .nodes = aggre1_noc_nodes,
        .num_nodes = ARRAY_SIZE(aggre1_noc_nodes),
        .bcms = aggre1_noc_bcms,
@@ -2051,6 +2035,7 @@ static struct qcom_icc_node * const aggre2_noc_nodes[] = {
 };
 
 static const struct qcom_icc_desc sc8280xp_aggre2_noc = {
+       .alloc_dyn_id = true,
        .nodes = aggre2_noc_nodes,
        .num_nodes = ARRAY_SIZE(aggre2_noc_nodes),
        .bcms = aggre2_noc_bcms,
@@ -2073,6 +2058,7 @@ static struct qcom_icc_node * const clk_virt_nodes[] = {
 };
 
 static const struct qcom_icc_desc sc8280xp_clk_virt = {
+       .alloc_dyn_id = true,
        .nodes = clk_virt_nodes,
        .num_nodes = ARRAY_SIZE(clk_virt_nodes),
        .bcms = clk_virt_bcms,
@@ -2177,6 +2163,7 @@ static struct qcom_icc_node * const config_noc_nodes[] = {
 };
 
 static const struct qcom_icc_desc sc8280xp_config_noc = {
+       .alloc_dyn_id = true,
        .nodes = config_noc_nodes,
        .num_nodes = ARRAY_SIZE(config_noc_nodes),
        .bcms = config_noc_bcms,
@@ -2193,6 +2180,7 @@ static struct qcom_icc_node * const dc_noc_nodes[] = {
 };
 
 static const struct qcom_icc_desc sc8280xp_dc_noc = {
+       .alloc_dyn_id = true,
        .nodes = dc_noc_nodes,
        .num_nodes = ARRAY_SIZE(dc_noc_nodes),
        .bcms = dc_noc_bcms,
@@ -2227,6 +2215,7 @@ static struct qcom_icc_node * const gem_noc_nodes[] = {
 };
 
 static const struct qcom_icc_desc sc8280xp_gem_noc = {
+       .alloc_dyn_id = true,
        .nodes = gem_noc_nodes,
        .num_nodes = ARRAY_SIZE(gem_noc_nodes),
        .bcms = gem_noc_bcms,
@@ -2250,6 +2239,7 @@ static struct qcom_icc_node * const lpass_ag_noc_nodes[] = {
 };
 
 static const struct qcom_icc_desc sc8280xp_lpass_ag_noc = {
+       .alloc_dyn_id = true,
        .nodes = lpass_ag_noc_nodes,
        .num_nodes = ARRAY_SIZE(lpass_ag_noc_nodes),
        .bcms = lpass_ag_noc_bcms,
@@ -2267,6 +2257,7 @@ static struct qcom_icc_node * const mc_virt_nodes[] = {
 };
 
 static const struct qcom_icc_desc sc8280xp_mc_virt = {
+       .alloc_dyn_id = true,
        .nodes = mc_virt_nodes,
        .num_nodes = ARRAY_SIZE(mc_virt_nodes),
        .bcms = mc_virt_bcms,
@@ -2298,6 +2289,7 @@ static struct qcom_icc_node * const mmss_noc_nodes[] = {
 };
 
 static const struct qcom_icc_desc sc8280xp_mmss_noc = {
+       .alloc_dyn_id = true,
        .nodes = mmss_noc_nodes,
        .num_nodes = ARRAY_SIZE(mmss_noc_nodes),
        .bcms = mmss_noc_bcms,
@@ -2318,6 +2310,7 @@ static struct qcom_icc_node * const nspa_noc_nodes[] = {
 };
 
 static const struct qcom_icc_desc sc8280xp_nspa_noc = {
+       .alloc_dyn_id = true,
        .nodes = nspa_noc_nodes,
        .num_nodes = ARRAY_SIZE(nspa_noc_nodes),
        .bcms = nspa_noc_bcms,
@@ -2338,6 +2331,7 @@ static struct qcom_icc_node * const nspb_noc_nodes[] = {
 };
 
 static const struct qcom_icc_desc sc8280xp_nspb_noc = {
+       .alloc_dyn_id = true,
        .nodes = nspb_noc_nodes,
        .num_nodes = ARRAY_SIZE(nspb_noc_nodes),
        .bcms = nspb_noc_bcms,
@@ -2367,6 +2361,7 @@ static struct qcom_icc_node * const system_noc_main_nodes[] = {
 };
 
 static const struct qcom_icc_desc sc8280xp_system_noc_main = {
+       .alloc_dyn_id = true,
        .nodes = system_noc_main_nodes,
        .num_nodes = ARRAY_SIZE(system_noc_main_nodes),
        .bcms = system_noc_main_bcms,

diff --git a/drivers/interconnect/qcom/sc8280xp.h b/drivers/interconnect/qcom/sc8280xp.h
deleted file mode 100644 (file)
index c5c410f..0000000
--- a/drivers/interconnect/qcom/sc8280xp.h
+++ /dev/null
@@ -1,209 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-/*
- * Copyright (c) 2021, The Linux Foundation. All rights reserved.
- */
-
-#ifndef __DRIVERS_INTERCONNECT_QCOM_SC8280XP_H
-#define __DRIVERS_INTERCONNECT_QCOM_SC8280XP_H
-
-#define SC8280XP_MASTER_GPU_TCU                                0
-#define SC8280XP_MASTER_PCIE_TCU                       1
-#define SC8280XP_MASTER_SYS_TCU                                2
-#define SC8280XP_MASTER_APPSS_PROC                     3
-/* 4 was used by SLAVE_IPA_CORE, now represented as RPMh clock */
-#define SC8280XP_MASTER_LLCC                           5
-#define SC8280XP_MASTER_CNOC_LPASS_AG_NOC              6
-#define SC8280XP_MASTER_CDSP_NOC_CFG                   7
-#define SC8280XP_MASTER_CDSPB_NOC_CFG                  8
-#define SC8280XP_MASTER_QDSS_BAM                       9
-#define SC8280XP_MASTER_QSPI_0                         10
-#define SC8280XP_MASTER_QUP_0                          11
-#define SC8280XP_MASTER_QUP_1                          12
-#define SC8280XP_MASTER_QUP_2                          13
-#define SC8280XP_MASTER_A1NOC_CFG                      14
-#define SC8280XP_MASTER_A2NOC_CFG                      15
-#define SC8280XP_MASTER_A1NOC_SNOC                     16
-#define SC8280XP_MASTER_A2NOC_SNOC                     17
-#define SC8280XP_MASTER_USB_NOC_SNOC                   18
-#define SC8280XP_MASTER_CAMNOC_HF                      19
-#define SC8280XP_MASTER_COMPUTE_NOC                    20
-#define SC8280XP_MASTER_COMPUTE_NOC_1                  21
-#define SC8280XP_MASTER_CNOC_DC_NOC                    22
-#define SC8280XP_MASTER_GEM_NOC_CFG                    23
-#define SC8280XP_MASTER_GEM_NOC_CNOC                   24
-#define SC8280XP_MASTER_GEM_NOC_PCIE_SNOC              25
-#define SC8280XP_MASTER_GFX3D                          26
-#define SC8280XP_MASTER_LPASS_ANOC                     27
-#define SC8280XP_MASTER_MDP0                           28
-#define SC8280XP_MASTER_MDP1                           29
-#define SC8280XP_MASTER_MDP_CORE1_0                    30
-#define SC8280XP_MASTER_MDP_CORE1_1                    31
-#define SC8280XP_MASTER_CNOC_MNOC_CFG                  32
-#define SC8280XP_MASTER_MNOC_HF_MEM_NOC                        33
-#define SC8280XP_MASTER_MNOC_SF_MEM_NOC                        34
-#define SC8280XP_MASTER_ANOC_PCIE_GEM_NOC              35
-#define SC8280XP_MASTER_ROTATOR                                36
-#define SC8280XP_MASTER_ROTATOR_1                      37
-#define SC8280XP_MASTER_SNOC_CFG                       38
-#define SC8280XP_MASTER_SNOC_GC_MEM_NOC                        39
-#define SC8280XP_MASTER_SNOC_SF_MEM_NOC                        40
-#define SC8280XP_MASTER_VIDEO_P0                       41
-#define SC8280XP_MASTER_VIDEO_P1                       42
-#define SC8280XP_MASTER_VIDEO_PROC                     43
-#define SC8280XP_MASTER_QUP_CORE_0                     44
-#define SC8280XP_MASTER_QUP_CORE_1                     45
-#define SC8280XP_MASTER_QUP_CORE_2                     46
-#define SC8280XP_MASTER_CAMNOC_ICP                     47
-#define SC8280XP_MASTER_CAMNOC_SF                      48
-#define SC8280XP_MASTER_CRYPTO                         49
-#define SC8280XP_MASTER_IPA                            50
-#define SC8280XP_MASTER_LPASS_PROC                     51
-#define SC8280XP_MASTER_CDSP_PROC                      52
-#define SC8280XP_MASTER_CDSP_PROC_B                    53
-#define SC8280XP_MASTER_PIMEM                          54
-#define SC8280XP_MASTER_SENSORS_PROC                   55
-#define SC8280XP_MASTER_SP                             56
-#define SC8280XP_MASTER_EMAC                           57
-#define SC8280XP_MASTER_EMAC_1                         58
-#define SC8280XP_MASTER_GIC                            59
-#define SC8280XP_MASTER_PCIE_0                         60
-#define SC8280XP_MASTER_PCIE_1                         61
-#define SC8280XP_MASTER_PCIE_2A                                62
-#define SC8280XP_MASTER_PCIE_2B                                63
-#define SC8280XP_MASTER_PCIE_3A                                64
-#define SC8280XP_MASTER_PCIE_3B                                65
-#define SC8280XP_MASTER_PCIE_4                         66
-#define SC8280XP_MASTER_QDSS_ETR                       67
-#define SC8280XP_MASTER_SDCC_2                         68
-#define SC8280XP_MASTER_SDCC_4                         69
-#define SC8280XP_MASTER_UFS_CARD                       70
-#define SC8280XP_MASTER_UFS_MEM                                71
-#define SC8280XP_MASTER_USB3_0                         72
-#define SC8280XP_MASTER_USB3_1                         73
-#define SC8280XP_MASTER_USB3_MP                                74
-#define SC8280XP_MASTER_USB4_0                         75
-#define SC8280XP_MASTER_USB4_1                         76
-#define SC8280XP_SLAVE_EBI1                            512
-/* 513 was used by SLAVE_IPA_CORE, now represented as RPMh clock */
-#define SC8280XP_SLAVE_AHB2PHY_0                       514
-#define SC8280XP_SLAVE_AHB2PHY_1                       515
-#define SC8280XP_SLAVE_AHB2PHY_2                       516
-#define SC8280XP_SLAVE_AOSS                            517
-#define SC8280XP_SLAVE_APPSS                           518
-#define SC8280XP_SLAVE_CAMERA_CFG                      519
-#define SC8280XP_SLAVE_CLK_CTL                         520
-#define SC8280XP_SLAVE_CDSP_CFG                                521
-#define SC8280XP_SLAVE_CDSP1_CFG                       522
-#define SC8280XP_SLAVE_RBCPR_CX_CFG                    523
-#define SC8280XP_SLAVE_RBCPR_MMCX_CFG                  524
-#define SC8280XP_SLAVE_RBCPR_MX_CFG                    525
-#define SC8280XP_SLAVE_CPR_NSPCX                       526
-#define SC8280XP_SLAVE_CRYPTO_0_CFG                    527
-#define SC8280XP_SLAVE_CX_RDPM                         528
-#define SC8280XP_SLAVE_DCC_CFG                         529
-#define SC8280XP_SLAVE_DISPLAY_CFG                     530
-#define SC8280XP_SLAVE_DISPLAY1_CFG                    531
-#define SC8280XP_SLAVE_EMAC_CFG                                532
-#define SC8280XP_SLAVE_EMAC1_CFG                       533
-#define SC8280XP_SLAVE_GFX3D_CFG                       534
-#define SC8280XP_SLAVE_HWKM                            535
-#define SC8280XP_SLAVE_IMEM_CFG                                536
-#define SC8280XP_SLAVE_IPA_CFG                         537
-#define SC8280XP_SLAVE_IPC_ROUTER_CFG                  538
-#define SC8280XP_SLAVE_LLCC_CFG                                539
-#define SC8280XP_SLAVE_LPASS                           540
-#define SC8280XP_SLAVE_LPASS_CORE_CFG                  541
-#define SC8280XP_SLAVE_LPASS_LPI_CFG                   542
-#define SC8280XP_SLAVE_LPASS_MPU_CFG                   543
-#define SC8280XP_SLAVE_LPASS_TOP_CFG                   544
-#define SC8280XP_SLAVE_MX_RDPM                         545
-#define SC8280XP_SLAVE_MXC_RDPM                                546
-#define SC8280XP_SLAVE_PCIE_0_CFG                      547
-#define SC8280XP_SLAVE_PCIE_1_CFG                      548
-#define SC8280XP_SLAVE_PCIE_2A_CFG                     549
-#define SC8280XP_SLAVE_PCIE_2B_CFG                     550
-#define SC8280XP_SLAVE_PCIE_3A_CFG                     551
-#define SC8280XP_SLAVE_PCIE_3B_CFG                     552
-#define SC8280XP_SLAVE_PCIE_4_CFG                      553
-#define SC8280XP_SLAVE_PCIE_RSC_CFG                    554
-#define SC8280XP_SLAVE_PDM                             555
-#define SC8280XP_SLAVE_PIMEM_CFG                       556
-#define SC8280XP_SLAVE_PKA_WRAPPER_CFG                 557
-#define SC8280XP_SLAVE_PMU_WRAPPER_CFG                 558
-#define SC8280XP_SLAVE_QDSS_CFG                                559
-#define SC8280XP_SLAVE_QSPI_0                          560
-#define SC8280XP_SLAVE_QUP_0                           561
-#define SC8280XP_SLAVE_QUP_1                           562
-#define SC8280XP_SLAVE_QUP_2                           563
-#define SC8280XP_SLAVE_SDCC_2                          564
-#define SC8280XP_SLAVE_SDCC_4                          565
-#define SC8280XP_SLAVE_SECURITY                                566
-#define SC8280XP_SLAVE_SMMUV3_CFG                      567
-#define SC8280XP_SLAVE_SMSS_CFG                                568
-#define SC8280XP_SLAVE_SPSS_CFG                                569
-#define SC8280XP_SLAVE_TCSR                            570
-#define SC8280XP_SLAVE_TLMM                            571
-#define SC8280XP_SLAVE_UFS_CARD_CFG                    572
-#define SC8280XP_SLAVE_UFS_MEM_CFG                     573
-#define SC8280XP_SLAVE_USB3_0                          574
-#define SC8280XP_SLAVE_USB3_1                          575
-#define SC8280XP_SLAVE_USB3_MP                         576
-#define SC8280XP_SLAVE_USB4_0                          577
-#define SC8280XP_SLAVE_USB4_1                          578
-#define SC8280XP_SLAVE_VENUS_CFG                       579
-#define SC8280XP_SLAVE_VSENSE_CTRL_CFG                 580
-#define SC8280XP_SLAVE_VSENSE_CTRL_R_CFG               581
-#define SC8280XP_SLAVE_A1NOC_CFG                       582
-#define SC8280XP_SLAVE_A1NOC_SNOC                      583
-#define SC8280XP_SLAVE_A2NOC_CFG                       584
-#define SC8280XP_SLAVE_A2NOC_SNOC                      585
-#define SC8280XP_SLAVE_USB_NOC_SNOC                    586
-#define SC8280XP_SLAVE_ANOC_PCIE_BRIDGE_CFG            587
-#define SC8280XP_SLAVE_DDRSS_CFG                       588
-#define SC8280XP_SLAVE_GEM_NOC_CNOC                    589
-#define SC8280XP_SLAVE_GEM_NOC_CFG                     590
-#define SC8280XP_SLAVE_SNOC_GEM_NOC_GC                 591
-#define SC8280XP_SLAVE_SNOC_GEM_NOC_SF                 592
-#define SC8280XP_SLAVE_LLCC                            593
-#define SC8280XP_SLAVE_MNOC_HF_MEM_NOC                 594
-#define SC8280XP_SLAVE_MNOC_SF_MEM_NOC                 595
-#define SC8280XP_SLAVE_CNOC_MNOC_CFG                   596
-#define SC8280XP_SLAVE_CDSP_MEM_NOC                    597
-#define SC8280XP_SLAVE_CDSPB_MEM_NOC                   598
-#define SC8280XP_SLAVE_GEM_NOC_PCIE_CNOC               599
-#define SC8280XP_SLAVE_ANOC_PCIE_GEM_NOC               600
-#define SC8280XP_SLAVE_SNOC_CFG                                601
-#define SC8280XP_SLAVE_SNOC_SF_BRIDGE_CFG              602
-#define SC8280XP_SLAVE_LPASS_SNOC                      603
-#define SC8280XP_SLAVE_QUP_CORE_0                      604
-#define SC8280XP_SLAVE_QUP_CORE_1                      605
-#define SC8280XP_SLAVE_QUP_CORE_2                      606
-#define SC8280XP_SLAVE_IMEM                            607
-#define SC8280XP_SLAVE_NSP_XFR                         608
-#define SC8280XP_SLAVE_NSPB_XFR                                609
-#define SC8280XP_SLAVE_PIMEM                           610
-#define SC8280XP_SLAVE_SERVICE_NSP_NOC                 611
-#define SC8280XP_SLAVE_SERVICE_NSPB_NOC                        612
-#define SC8280XP_SLAVE_SERVICE_A1NOC                   613
-#define SC8280XP_SLAVE_SERVICE_A2NOC                   614
-#define SC8280XP_SLAVE_SERVICE_CNOC                    615
-#define SC8280XP_SLAVE_SERVICE_GEM_NOC_1               616
-#define SC8280XP_SLAVE_SERVICE_MNOC                    617
-#define SC8280XP_SLAVE_SERVICES_LPASS_AML_NOC          618
-#define SC8280XP_SLAVE_SERVICE_LPASS_AG_NOC            619
-#define SC8280XP_SLAVE_SERVICE_GEM_NOC_2               620
-#define SC8280XP_SLAVE_SERVICE_SNOC                    621
-#define SC8280XP_SLAVE_SERVICE_GEM_NOC                 622
-#define SC8280XP_SLAVE_PCIE_0                          623
-#define SC8280XP_SLAVE_PCIE_1                          624
-#define SC8280XP_SLAVE_PCIE_2A                         625
-#define SC8280XP_SLAVE_PCIE_2B                         626
-#define SC8280XP_SLAVE_PCIE_3A                         627
-#define SC8280XP_SLAVE_PCIE_3B                         628
-#define SC8280XP_SLAVE_PCIE_4                          629
-#define SC8280XP_SLAVE_QDSS_STM                                630
-#define SC8280XP_SLAVE_SMSS                            631
-#define SC8280XP_SLAVE_TCU                             632
-
-#endif
-