Discard the static IDs from node data and set the default node ID to -1 to indicate the for dynamic ID allocation. Update the topology to use node pointers for links instead of static IDs, and rearrange the node definitions to avoid undefined references. Signed-off-by: Raviteja Laggyshetty <quic_rlaggysh@xxxxxxxxxxx> --- drivers/interconnect/qcom/sa8775p.c | 2194 ++++++++++++--------------- 1 file changed, 962 insertions(+), 1232 deletions(-) diff --git a/drivers/interconnect/qcom/sa8775p.c b/drivers/interconnect/qcom/sa8775p.c index e2826af3ea2e..f666a24851a6 100644 --- a/drivers/interconnect/qcom/sa8775p.c +++ b/drivers/interconnect/qcom/sa8775p.c @@ -15,1861 +15,1591 @@ #include "bcm-voter.h" #include "icc-rpmh.h" -#define SA8775P_MASTER_GPU_TCU 0 -#define SA8775P_MASTER_PCIE_TCU 1 -#define SA8775P_MASTER_SYS_TCU 2 -#define SA8775P_MASTER_APPSS_PROC 3 -#define SA8775P_MASTER_LLCC 4 -#define SA8775P_MASTER_CNOC_LPASS_AG_NOC 5 -#define SA8775P_MASTER_GIC_AHB 6 -#define SA8775P_MASTER_CDSP_NOC_CFG 7 -#define SA8775P_MASTER_CDSPB_NOC_CFG 8 -#define SA8775P_MASTER_QDSS_BAM 9 -#define SA8775P_MASTER_QUP_0 10 -#define SA8775P_MASTER_QUP_1 11 -#define SA8775P_MASTER_QUP_2 12 -#define SA8775P_MASTER_A1NOC_SNOC 13 -#define SA8775P_MASTER_A2NOC_SNOC 14 -#define SA8775P_MASTER_CAMNOC_HF 15 -#define SA8775P_MASTER_CAMNOC_ICP 16 -#define SA8775P_MASTER_CAMNOC_SF 17 -#define SA8775P_MASTER_COMPUTE_NOC 18 -#define SA8775P_MASTER_COMPUTE_NOC_1 19 -#define SA8775P_MASTER_CNOC_A2NOC 20 -#define SA8775P_MASTER_CNOC_DC_NOC 21 -#define SA8775P_MASTER_GEM_NOC_CFG 22 -#define SA8775P_MASTER_GEM_NOC_CNOC 23 -#define SA8775P_MASTER_GEM_NOC_PCIE_SNOC 24 -#define SA8775P_MASTER_GPDSP_SAIL 25 -#define SA8775P_MASTER_GFX3D 26 -#define SA8775P_MASTER_LPASS_ANOC 27 -#define SA8775P_MASTER_MDP0 28 -#define SA8775P_MASTER_MDP1 29 -#define SA8775P_MASTER_MDP_CORE1_0 30 -#define SA8775P_MASTER_MDP_CORE1_1 31 -#define SA8775P_MASTER_MNOC_HF_MEM_NOC 32 -#define SA8775P_MASTER_CNOC_MNOC_HF_CFG 33 -#define SA8775P_MASTER_MNOC_SF_MEM_NOC 34 -#define SA8775P_MASTER_CNOC_MNOC_SF_CFG 35 -#define SA8775P_MASTER_ANOC_PCIE_GEM_NOC 36 -#define SA8775P_MASTER_SNOC_CFG 37 -#define SA8775P_MASTER_SNOC_GC_MEM_NOC 38 -#define SA8775P_MASTER_SNOC_SF_MEM_NOC 39 -#define SA8775P_MASTER_VIDEO_P0 40 -#define SA8775P_MASTER_VIDEO_P1 41 -#define SA8775P_MASTER_VIDEO_PROC 42 -#define SA8775P_MASTER_VIDEO_V_PROC 43 -#define SA8775P_MASTER_QUP_CORE_0 44 -#define SA8775P_MASTER_QUP_CORE_1 45 -#define SA8775P_MASTER_QUP_CORE_2 46 -#define SA8775P_MASTER_QUP_CORE_3 47 -#define SA8775P_MASTER_CRYPTO_CORE0 48 -#define SA8775P_MASTER_CRYPTO_CORE1 49 -#define SA8775P_MASTER_DSP0 50 -#define SA8775P_MASTER_DSP1 51 -#define SA8775P_MASTER_IPA 52 -#define SA8775P_MASTER_LPASS_PROC 53 -#define SA8775P_MASTER_CDSP_PROC 54 -#define SA8775P_MASTER_CDSP_PROC_B 55 -#define SA8775P_MASTER_PIMEM 56 -#define SA8775P_MASTER_QUP_3 57 -#define SA8775P_MASTER_EMAC 58 -#define SA8775P_MASTER_EMAC_1 59 -#define SA8775P_MASTER_GIC 60 -#define SA8775P_MASTER_PCIE_0 61 -#define SA8775P_MASTER_PCIE_1 62 -#define SA8775P_MASTER_QDSS_ETR_0 63 -#define SA8775P_MASTER_QDSS_ETR_1 64 -#define SA8775P_MASTER_SDC 65 -#define SA8775P_MASTER_UFS_CARD 66 -#define SA8775P_MASTER_UFS_MEM 67 -#define SA8775P_MASTER_USB2 68 -#define SA8775P_MASTER_USB3_0 69 -#define SA8775P_MASTER_USB3_1 70 -#define SA8775P_SLAVE_EBI1 512 -#define SA8775P_SLAVE_AHB2PHY_0 513 -#define SA8775P_SLAVE_AHB2PHY_1 514 -#define SA8775P_SLAVE_AHB2PHY_2 515 -#define SA8775P_SLAVE_AHB2PHY_3 516 -#define SA8775P_SLAVE_ANOC_THROTTLE_CFG 517 -#define SA8775P_SLAVE_AOSS 518 -#define SA8775P_SLAVE_APPSS 519 -#define SA8775P_SLAVE_BOOT_ROM 520 -#define SA8775P_SLAVE_CAMERA_CFG 521 -#define SA8775P_SLAVE_CAMERA_NRT_THROTTLE_CFG 522 -#define SA8775P_SLAVE_CAMERA_RT_THROTTLE_CFG 523 -#define SA8775P_SLAVE_CLK_CTL 524 -#define SA8775P_SLAVE_CDSP_CFG 525 -#define SA8775P_SLAVE_CDSP1_CFG 526 -#define SA8775P_SLAVE_RBCPR_CX_CFG 527 -#define SA8775P_SLAVE_RBCPR_MMCX_CFG 528 -#define SA8775P_SLAVE_RBCPR_MX_CFG 529 -#define SA8775P_SLAVE_CPR_NSPCX 530 -#define SA8775P_SLAVE_CRYPTO_0_CFG 531 -#define SA8775P_SLAVE_CX_RDPM 532 -#define SA8775P_SLAVE_DISPLAY_CFG 533 -#define SA8775P_SLAVE_DISPLAY_RT_THROTTLE_CFG 534 -#define SA8775P_SLAVE_DISPLAY1_CFG 535 -#define SA8775P_SLAVE_DISPLAY1_RT_THROTTLE_CFG 536 -#define SA8775P_SLAVE_EMAC_CFG 537 -#define SA8775P_SLAVE_EMAC1_CFG 538 -#define SA8775P_SLAVE_GP_DSP0_CFG 539 -#define SA8775P_SLAVE_GP_DSP1_CFG 540 -#define SA8775P_SLAVE_GPDSP0_THROTTLE_CFG 541 -#define SA8775P_SLAVE_GPDSP1_THROTTLE_CFG 542 -#define SA8775P_SLAVE_GPU_TCU_THROTTLE_CFG 543 -#define SA8775P_SLAVE_GFX3D_CFG 544 -#define SA8775P_SLAVE_HWKM 545 -#define SA8775P_SLAVE_IMEM_CFG 546 -#define SA8775P_SLAVE_IPA_CFG 547 -#define SA8775P_SLAVE_IPC_ROUTER_CFG 548 -#define SA8775P_SLAVE_LLCC_CFG 549 -#define SA8775P_SLAVE_LPASS 550 -#define SA8775P_SLAVE_LPASS_CORE_CFG 551 -#define SA8775P_SLAVE_LPASS_LPI_CFG 552 -#define SA8775P_SLAVE_LPASS_MPU_CFG 553 -#define SA8775P_SLAVE_LPASS_THROTTLE_CFG 554 -#define SA8775P_SLAVE_LPASS_TOP_CFG 555 -#define SA8775P_SLAVE_MX_RDPM 556 -#define SA8775P_SLAVE_MXC_RDPM 557 -#define SA8775P_SLAVE_PCIE_0_CFG 558 -#define SA8775P_SLAVE_PCIE_1_CFG 559 -#define SA8775P_SLAVE_PCIE_RSC_CFG 560 -#define SA8775P_SLAVE_PCIE_TCU_THROTTLE_CFG 561 -#define SA8775P_SLAVE_PCIE_THROTTLE_CFG 562 -#define SA8775P_SLAVE_PDM 563 -#define SA8775P_SLAVE_PIMEM_CFG 564 -#define SA8775P_SLAVE_PKA_WRAPPER_CFG 565 -#define SA8775P_SLAVE_QDSS_CFG 566 -#define SA8775P_SLAVE_QM_CFG 567 -#define SA8775P_SLAVE_QM_MPU_CFG 568 -#define SA8775P_SLAVE_QUP_0 569 -#define SA8775P_SLAVE_QUP_1 570 -#define SA8775P_SLAVE_QUP_2 571 -#define SA8775P_SLAVE_QUP_3 572 -#define SA8775P_SLAVE_SAIL_THROTTLE_CFG 573 -#define SA8775P_SLAVE_SDC1 574 -#define SA8775P_SLAVE_SECURITY 575 -#define SA8775P_SLAVE_SNOC_THROTTLE_CFG 576 -#define SA8775P_SLAVE_TCSR 577 -#define SA8775P_SLAVE_TLMM 578 -#define SA8775P_SLAVE_TSC_CFG 579 -#define SA8775P_SLAVE_UFS_CARD_CFG 580 -#define SA8775P_SLAVE_UFS_MEM_CFG 581 -#define SA8775P_SLAVE_USB2 582 -#define SA8775P_SLAVE_USB3_0 583 -#define SA8775P_SLAVE_USB3_1 584 -#define SA8775P_SLAVE_VENUS_CFG 585 -#define SA8775P_SLAVE_VENUS_CVP_THROTTLE_CFG 586 -#define SA8775P_SLAVE_VENUS_V_CPU_THROTTLE_CFG 587 -#define SA8775P_SLAVE_VENUS_VCODEC_THROTTLE_CFG 588 -#define SA8775P_SLAVE_A1NOC_SNOC 589 -#define SA8775P_SLAVE_A2NOC_SNOC 590 -#define SA8775P_SLAVE_DDRSS_CFG 591 -#define SA8775P_SLAVE_GEM_NOC_CNOC 592 -#define SA8775P_SLAVE_GEM_NOC_CFG 593 -#define SA8775P_SLAVE_SNOC_GEM_NOC_GC 594 -#define SA8775P_SLAVE_SNOC_GEM_NOC_SF 595 -#define SA8775P_SLAVE_GP_DSP_SAIL_NOC 596 -#define SA8775P_SLAVE_GPDSP_NOC_CFG 597 -#define SA8775P_SLAVE_HCP_A 598 -#define SA8775P_SLAVE_LLCC 599 -#define SA8775P_SLAVE_MNOC_HF_MEM_NOC 600 -#define SA8775P_SLAVE_MNOC_SF_MEM_NOC 601 -#define SA8775P_SLAVE_CNOC_MNOC_HF_CFG 602 -#define SA8775P_SLAVE_CNOC_MNOC_SF_CFG 603 -#define SA8775P_SLAVE_CDSP_MEM_NOC 604 -#define SA8775P_SLAVE_CDSPB_MEM_NOC 605 -#define SA8775P_SLAVE_HCP_B 606 -#define SA8775P_SLAVE_GEM_NOC_PCIE_CNOC 607 -#define SA8775P_SLAVE_PCIE_ANOC_CFG 608 -#define SA8775P_SLAVE_ANOC_PCIE_GEM_NOC 609 -#define SA8775P_SLAVE_SNOC_CFG 610 -#define SA8775P_SLAVE_LPASS_SNOC 611 -#define SA8775P_SLAVE_QUP_CORE_0 612 -#define SA8775P_SLAVE_QUP_CORE_1 613 -#define SA8775P_SLAVE_QUP_CORE_2 614 -#define SA8775P_SLAVE_QUP_CORE_3 615 -#define SA8775P_SLAVE_BOOT_IMEM 616 -#define SA8775P_SLAVE_IMEM 617 -#define SA8775P_SLAVE_PIMEM 618 -#define SA8775P_SLAVE_SERVICE_NSP_NOC 619 -#define SA8775P_SLAVE_SERVICE_NSPB_NOC 620 -#define SA8775P_SLAVE_SERVICE_GEM_NOC_1 621 -#define SA8775P_SLAVE_SERVICE_MNOC_HF 622 -#define SA8775P_SLAVE_SERVICE_MNOC_SF 623 -#define SA8775P_SLAVE_SERVICES_LPASS_AML_NOC 624 -#define SA8775P_SLAVE_SERVICE_LPASS_AG_NOC 625 -#define SA8775P_SLAVE_SERVICE_GEM_NOC_2 626 -#define SA8775P_SLAVE_SERVICE_SNOC 627 -#define SA8775P_SLAVE_SERVICE_GEM_NOC 628 -#define SA8775P_SLAVE_SERVICE_GEM_NOC2 629 -#define SA8775P_SLAVE_PCIE_0 630 -#define SA8775P_SLAVE_PCIE_1 631 -#define SA8775P_SLAVE_QDSS_STM 632 -#define SA8775P_SLAVE_TCU 633 +#define ALLOC_DYN_ID -1 -static struct qcom_icc_node qxm_qup3 = { - .name = "qxm_qup3", - .id = SA8775P_MASTER_QUP_3, - .channels = 1, - .buswidth = 8, - .num_links = 1, - .links = { SA8775P_SLAVE_A1NOC_SNOC }, -}; -static struct qcom_icc_node xm_emac_0 = { - .name = "xm_emac_0", - .id = SA8775P_MASTER_EMAC, +static struct qcom_icc_node qup0_core_slave = { + .name = "qup0_core_slave", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 8, - .num_links = 1, - .links = { SA8775P_SLAVE_A1NOC_SNOC }, + .buswidth = 4, }; -static struct qcom_icc_node xm_emac_1 = { - .name = "xm_emac_1", - .id = SA8775P_MASTER_EMAC_1, +static struct qcom_icc_node qup1_core_slave = { + .name = "qup1_core_slave", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 8, - .num_links = 1, - .links = { SA8775P_SLAVE_A1NOC_SNOC }, + .buswidth = 4, }; -static struct qcom_icc_node xm_sdc1 = { - .name = "xm_sdc1", - .id = SA8775P_MASTER_SDC, +static struct qcom_icc_node qup2_core_slave = { + .name = "qup2_core_slave", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 8, - .num_links = 1, - .links = { SA8775P_SLAVE_A1NOC_SNOC }, + .buswidth = 4, }; -static struct qcom_icc_node xm_ufs_mem = { - .name = "xm_ufs_mem", - .id = SA8775P_MASTER_UFS_MEM, +static struct qcom_icc_node qup3_core_slave = { + .name = "qup3_core_slave", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 8, - .num_links = 1, - .links = { SA8775P_SLAVE_A1NOC_SNOC }, + .buswidth = 4, }; -static struct qcom_icc_node xm_usb2_2 = { - .name = "xm_usb2_2", - .id = SA8775P_MASTER_USB2, +static struct qcom_icc_node qhs_ahb2phy0 = { + .name = "qhs_ahb2phy0", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 8, - .num_links = 1, - .links = { SA8775P_SLAVE_A1NOC_SNOC }, + .buswidth = 4, }; -static struct qcom_icc_node xm_usb3_0 = { - .name = "xm_usb3_0", - .id = SA8775P_MASTER_USB3_0, +static struct qcom_icc_node qhs_ahb2phy1 = { + .name = "qhs_ahb2phy1", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 8, - .num_links = 1, - .links = { SA8775P_SLAVE_A1NOC_SNOC }, + .buswidth = 4, }; -static struct qcom_icc_node xm_usb3_1 = { - .name = "xm_usb3_1", - .id = SA8775P_MASTER_USB3_1, +static struct qcom_icc_node qhs_ahb2phy2 = { + .name = "qhs_ahb2phy2", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 8, - .num_links = 1, - .links = { SA8775P_SLAVE_A1NOC_SNOC }, + .buswidth = 4, }; -static struct qcom_icc_node qhm_qdss_bam = { - .name = "qhm_qdss_bam", - .id = SA8775P_MASTER_QDSS_BAM, +static struct qcom_icc_node qhs_ahb2phy3 = { + .name = "qhs_ahb2phy3", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, - .num_links = 1, - .links = { SA8775P_SLAVE_A2NOC_SNOC }, }; -static struct qcom_icc_node qhm_qup0 = { - .name = "qhm_qup0", - .id = SA8775P_MASTER_QUP_0, +static struct qcom_icc_node qhs_anoc_throttle_cfg = { + .name = "qhs_anoc_throttle_cfg", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, - .num_links = 1, - .links = { SA8775P_SLAVE_A2NOC_SNOC }, }; -static struct qcom_icc_node qhm_qup1 = { - .name = "qhm_qup1", - .id = SA8775P_MASTER_QUP_1, +static struct qcom_icc_node qhs_aoss = { + .name = "qhs_aoss", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, - .num_links = 1, - .links = { SA8775P_SLAVE_A2NOC_SNOC }, }; -static struct qcom_icc_node qhm_qup2 = { - .name = "qhm_qup2", - .id = SA8775P_MASTER_QUP_2, +static struct qcom_icc_node qhs_apss = { + .name = "qhs_apss", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, - .num_links = 1, - .links = { SA8775P_SLAVE_A2NOC_SNOC }, + .buswidth = 8, }; -static struct qcom_icc_node qnm_cnoc_datapath = { - .name = "qnm_cnoc_datapath", - .id = SA8775P_MASTER_CNOC_A2NOC, +static struct qcom_icc_node qhs_boot_rom = { + .name = "qhs_boot_rom", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 8, - .num_links = 1, - .links = { SA8775P_SLAVE_A2NOC_SNOC }, + .buswidth = 4, }; -static struct qcom_icc_node qxm_crypto_0 = { - .name = "qxm_crypto_0", - .id = SA8775P_MASTER_CRYPTO_CORE0, +static struct qcom_icc_node qhs_camera_cfg = { + .name = "qhs_camera_cfg", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 8, - .num_links = 1, - .links = { SA8775P_SLAVE_A2NOC_SNOC }, + .buswidth = 4, }; -static struct qcom_icc_node qxm_crypto_1 = { - .name = "qxm_crypto_1", - .id = SA8775P_MASTER_CRYPTO_CORE1, +static struct qcom_icc_node qhs_camera_nrt_throttle_cfg = { + .name = "qhs_camera_nrt_throttle_cfg", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 8, - .num_links = 1, - .links = { SA8775P_SLAVE_A2NOC_SNOC }, + .buswidth = 4, }; -static struct qcom_icc_node qxm_ipa = { - .name = "qxm_ipa", - .id = SA8775P_MASTER_IPA, +static struct qcom_icc_node qhs_camera_rt_throttle_cfg = { + .name = "qhs_camera_rt_throttle_cfg", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 8, - .num_links = 1, - .links = { SA8775P_SLAVE_A2NOC_SNOC }, + .buswidth = 4, }; -static struct qcom_icc_node xm_qdss_etr_0 = { - .name = "xm_qdss_etr_0", - .id = SA8775P_MASTER_QDSS_ETR_0, +static struct qcom_icc_node qhs_clk_ctl = { + .name = "qhs_clk_ctl", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 8, - .num_links = 1, - .links = { SA8775P_SLAVE_A2NOC_SNOC }, + .buswidth = 4, }; -static struct qcom_icc_node xm_qdss_etr_1 = { - .name = "xm_qdss_etr_1", - .id = SA8775P_MASTER_QDSS_ETR_1, +static struct qcom_icc_node qhs_cpr_cx = { + .name = "qhs_cpr_cx", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 8, - .num_links = 1, - .links = { SA8775P_SLAVE_A2NOC_SNOC }, + .buswidth = 4, }; -static struct qcom_icc_node xm_ufs_card = { - .name = "xm_ufs_card", - .id = SA8775P_MASTER_UFS_CARD, +static struct qcom_icc_node qhs_cpr_mmcx = { + .name = "qhs_cpr_mmcx", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 8, - .num_links = 1, - .links = { SA8775P_SLAVE_A2NOC_SNOC }, + .buswidth = 4, }; -static struct qcom_icc_node qup0_core_master = { - .name = "qup0_core_master", - .id = SA8775P_MASTER_QUP_CORE_0, +static struct qcom_icc_node qhs_cpr_mx = { + .name = "qhs_cpr_mx", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, - .num_links = 1, - .links = { SA8775P_SLAVE_QUP_CORE_0 }, }; -static struct qcom_icc_node qup1_core_master = { - .name = "qup1_core_master", - .id = SA8775P_MASTER_QUP_CORE_1, +static struct qcom_icc_node qhs_cpr_nspcx = { + .name = "qhs_cpr_nspcx", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, - .num_links = 1, - .links = { SA8775P_SLAVE_QUP_CORE_1 }, }; -static struct qcom_icc_node qup2_core_master = { - .name = "qup2_core_master", - .id = SA8775P_MASTER_QUP_CORE_2, +static struct qcom_icc_node qhs_crypto0_cfg = { + .name = "qhs_crypto0_cfg", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, - .num_links = 1, - .links = { SA8775P_SLAVE_QUP_CORE_2 }, }; -static struct qcom_icc_node qup3_core_master = { - .name = "qup3_core_master", - .id = SA8775P_MASTER_QUP_CORE_3, +static struct qcom_icc_node qhs_cx_rdpm = { + .name = "qhs_cx_rdpm", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, - .num_links = 1, - .links = { SA8775P_SLAVE_QUP_CORE_3 }, }; -static struct qcom_icc_node qnm_gemnoc_cnoc = { - .name = "qnm_gemnoc_cnoc", - .id = SA8775P_MASTER_GEM_NOC_CNOC, +static struct qcom_icc_node qhs_display0_cfg = { + .name = "qhs_display0_cfg", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 16, - .num_links = 82, - .links = { SA8775P_SLAVE_AHB2PHY_0, - SA8775P_SLAVE_AHB2PHY_1, - SA8775P_SLAVE_AHB2PHY_2, - SA8775P_SLAVE_AHB2PHY_3, - SA8775P_SLAVE_ANOC_THROTTLE_CFG, - SA8775P_SLAVE_AOSS, - SA8775P_SLAVE_APPSS, - SA8775P_SLAVE_BOOT_ROM, - SA8775P_SLAVE_CAMERA_CFG, - SA8775P_SLAVE_CAMERA_NRT_THROTTLE_CFG, - SA8775P_SLAVE_CAMERA_RT_THROTTLE_CFG, - SA8775P_SLAVE_CLK_CTL, - SA8775P_SLAVE_CDSP_CFG, - SA8775P_SLAVE_CDSP1_CFG, - SA8775P_SLAVE_RBCPR_CX_CFG, - SA8775P_SLAVE_RBCPR_MMCX_CFG, - SA8775P_SLAVE_RBCPR_MX_CFG, - SA8775P_SLAVE_CPR_NSPCX, - SA8775P_SLAVE_CRYPTO_0_CFG, - SA8775P_SLAVE_CX_RDPM, - SA8775P_SLAVE_DISPLAY_CFG, - SA8775P_SLAVE_DISPLAY_RT_THROTTLE_CFG, - SA8775P_SLAVE_DISPLAY1_CFG, - SA8775P_SLAVE_DISPLAY1_RT_THROTTLE_CFG, - SA8775P_SLAVE_EMAC_CFG, - SA8775P_SLAVE_EMAC1_CFG, - SA8775P_SLAVE_GP_DSP0_CFG, - SA8775P_SLAVE_GP_DSP1_CFG, - SA8775P_SLAVE_GPDSP0_THROTTLE_CFG, - SA8775P_SLAVE_GPDSP1_THROTTLE_CFG, - SA8775P_SLAVE_GPU_TCU_THROTTLE_CFG, - SA8775P_SLAVE_GFX3D_CFG, - SA8775P_SLAVE_HWKM, - SA8775P_SLAVE_IMEM_CFG, - SA8775P_SLAVE_IPA_CFG, - SA8775P_SLAVE_IPC_ROUTER_CFG, - SA8775P_SLAVE_LPASS, - SA8775P_SLAVE_LPASS_THROTTLE_CFG, - SA8775P_SLAVE_MX_RDPM, - SA8775P_SLAVE_MXC_RDPM, - SA8775P_SLAVE_PCIE_0_CFG, - SA8775P_SLAVE_PCIE_1_CFG, - SA8775P_SLAVE_PCIE_RSC_CFG, - SA8775P_SLAVE_PCIE_TCU_THROTTLE_CFG, - SA8775P_SLAVE_PCIE_THROTTLE_CFG, - SA8775P_SLAVE_PDM, - SA8775P_SLAVE_PIMEM_CFG, - SA8775P_SLAVE_PKA_WRAPPER_CFG, - SA8775P_SLAVE_QDSS_CFG, - SA8775P_SLAVE_QM_CFG, - SA8775P_SLAVE_QM_MPU_CFG, - SA8775P_SLAVE_QUP_0, - SA8775P_SLAVE_QUP_1, - SA8775P_SLAVE_QUP_2, - SA8775P_SLAVE_QUP_3, - SA8775P_SLAVE_SAIL_THROTTLE_CFG, - SA8775P_SLAVE_SDC1, - SA8775P_SLAVE_SECURITY, - SA8775P_SLAVE_SNOC_THROTTLE_CFG, - SA8775P_SLAVE_TCSR, - SA8775P_SLAVE_TLMM, - SA8775P_SLAVE_TSC_CFG, - SA8775P_SLAVE_UFS_CARD_CFG, - SA8775P_SLAVE_UFS_MEM_CFG, - SA8775P_SLAVE_USB2, - SA8775P_SLAVE_USB3_0, - SA8775P_SLAVE_USB3_1, - SA8775P_SLAVE_VENUS_CFG, - SA8775P_SLAVE_VENUS_CVP_THROTTLE_CFG, - SA8775P_SLAVE_VENUS_V_CPU_THROTTLE_CFG, - SA8775P_SLAVE_VENUS_VCODEC_THROTTLE_CFG, - SA8775P_SLAVE_DDRSS_CFG, - SA8775P_SLAVE_GPDSP_NOC_CFG, - SA8775P_SLAVE_CNOC_MNOC_HF_CFG, - SA8775P_SLAVE_CNOC_MNOC_SF_CFG, - SA8775P_SLAVE_PCIE_ANOC_CFG, - SA8775P_SLAVE_SNOC_CFG, - SA8775P_SLAVE_BOOT_IMEM, - SA8775P_SLAVE_IMEM, - SA8775P_SLAVE_PIMEM, - SA8775P_SLAVE_QDSS_STM, - SA8775P_SLAVE_TCU - }, + .buswidth = 4, }; -static struct qcom_icc_node qnm_gemnoc_pcie = { - .name = "qnm_gemnoc_pcie", - .id = SA8775P_MASTER_GEM_NOC_PCIE_SNOC, +static struct qcom_icc_node qhs_display0_rt_throttle_cfg = { + .name = "qhs_display0_rt_throttle_cfg", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 16, - .num_links = 2, - .links = { SA8775P_SLAVE_PCIE_0, - SA8775P_SLAVE_PCIE_1 - }, + .buswidth = 4, }; -static struct qcom_icc_node qnm_cnoc_dc_noc = { - .name = "qnm_cnoc_dc_noc", - .id = SA8775P_MASTER_CNOC_DC_NOC, +static struct qcom_icc_node qhs_display1_cfg = { + .name = "qhs_display1_cfg", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, - .num_links = 2, - .links = { SA8775P_SLAVE_LLCC_CFG, - SA8775P_SLAVE_GEM_NOC_CFG - }, }; -static struct qcom_icc_node alm_gpu_tcu = { - .name = "alm_gpu_tcu", - .id = SA8775P_MASTER_GPU_TCU, +static struct qcom_icc_node qhs_display1_rt_throttle_cfg = { + .name = "qhs_display1_rt_throttle_cfg", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 8, - .num_links = 2, - .links = { SA8775P_SLAVE_GEM_NOC_CNOC, - SA8775P_SLAVE_LLCC - }, + .buswidth = 4, }; -static struct qcom_icc_node alm_pcie_tcu = { - .name = "alm_pcie_tcu", - .id = SA8775P_MASTER_PCIE_TCU, +static struct qcom_icc_node qhs_emac0_cfg = { + .name = "qhs_emac0_cfg", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 8, - .num_links = 2, - .links = { SA8775P_SLAVE_GEM_NOC_CNOC, - SA8775P_SLAVE_LLCC - }, + .buswidth = 4, }; -static struct qcom_icc_node alm_sys_tcu = { - .name = "alm_sys_tcu", - .id = SA8775P_MASTER_SYS_TCU, +static struct qcom_icc_node qhs_emac1_cfg = { + .name = "qhs_emac1_cfg", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 8, - .num_links = 2, - .links = { SA8775P_SLAVE_GEM_NOC_CNOC, - SA8775P_SLAVE_LLCC - }, + .buswidth = 4, }; -static struct qcom_icc_node chm_apps = { - .name = "chm_apps", - .id = SA8775P_MASTER_APPSS_PROC, - .channels = 4, - .buswidth = 32, - .num_links = 3, - .links = { SA8775P_SLAVE_GEM_NOC_CNOC, - SA8775P_SLAVE_LLCC, - SA8775P_SLAVE_GEM_NOC_PCIE_CNOC - }, +static struct qcom_icc_node qhs_gp_dsp0_cfg = { + .name = "qhs_gp_dsp0_cfg", + .id = ALLOC_DYN_ID, + .channels = 1, + .buswidth = 4, }; -static struct qcom_icc_node qnm_cmpnoc0 = { - .name = "qnm_cmpnoc0", - .id = SA8775P_MASTER_COMPUTE_NOC, - .channels = 2, - .buswidth = 32, - .num_links = 2, - .links = { SA8775P_SLAVE_GEM_NOC_CNOC, - SA8775P_SLAVE_LLCC - }, +static struct qcom_icc_node qhs_gp_dsp1_cfg = { + .name = "qhs_gp_dsp1_cfg", + .id = ALLOC_DYN_ID, + .channels = 1, + .buswidth = 4, }; -static struct qcom_icc_node qnm_cmpnoc1 = { - .name = "qnm_cmpnoc1", - .id = SA8775P_MASTER_COMPUTE_NOC_1, - .channels = 2, - .buswidth = 32, - .num_links = 2, - .links = { SA8775P_SLAVE_GEM_NOC_CNOC, - SA8775P_SLAVE_LLCC - }, +static struct qcom_icc_node qhs_gpdsp0_throttle_cfg = { + .name = "qhs_gpdsp0_throttle_cfg", + .id = ALLOC_DYN_ID, + .channels = 1, + .buswidth = 4, }; -static struct qcom_icc_node qnm_gemnoc_cfg = { - .name = "qnm_gemnoc_cfg", - .id = SA8775P_MASTER_GEM_NOC_CFG, +static struct qcom_icc_node qhs_gpdsp1_throttle_cfg = { + .name = "qhs_gpdsp1_throttle_cfg", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, - .num_links = 4, - .links = { SA8775P_SLAVE_SERVICE_GEM_NOC_1, - SA8775P_SLAVE_SERVICE_GEM_NOC_2, - SA8775P_SLAVE_SERVICE_GEM_NOC, - SA8775P_SLAVE_SERVICE_GEM_NOC2 - }, }; -static struct qcom_icc_node qnm_gpdsp_sail = { - .name = "qnm_gpdsp_sail", - .id = SA8775P_MASTER_GPDSP_SAIL, +static struct qcom_icc_node qhs_gpu_tcu_throttle_cfg = { + .name = "qhs_gpu_tcu_throttle_cfg", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 16, - .num_links = 2, - .links = { SA8775P_SLAVE_GEM_NOC_CNOC, - SA8775P_SLAVE_LLCC - }, + .buswidth = 4, }; -static struct qcom_icc_node qnm_gpu = { - .name = "qnm_gpu", - .id = SA8775P_MASTER_GFX3D, - .channels = 2, - .buswidth = 32, - .num_links = 2, - .links = { SA8775P_SLAVE_GEM_NOC_CNOC, - SA8775P_SLAVE_LLCC - }, +static struct qcom_icc_node qhs_gpuss_cfg = { + .name = "qhs_gpuss_cfg", + .id = ALLOC_DYN_ID, + .channels = 1, + .buswidth = 8, }; -static struct qcom_icc_node qnm_mnoc_hf = { - .name = "qnm_mnoc_hf", - .id = SA8775P_MASTER_MNOC_HF_MEM_NOC, - .channels = 2, - .buswidth = 32, - .num_links = 2, - .links = { SA8775P_SLAVE_LLCC, - SA8775P_SLAVE_GEM_NOC_PCIE_CNOC - }, +static struct qcom_icc_node qhs_hwkm = { + .name = "qhs_hwkm", + .id = ALLOC_DYN_ID, + .channels = 1, + .buswidth = 4, }; -static struct qcom_icc_node qnm_mnoc_sf = { - .name = "qnm_mnoc_sf", - .id = SA8775P_MASTER_MNOC_SF_MEM_NOC, - .channels = 2, - .buswidth = 32, - .num_links = 3, - .links = { SA8775P_SLAVE_GEM_NOC_CNOC, - SA8775P_SLAVE_LLCC, - SA8775P_SLAVE_GEM_NOC_PCIE_CNOC - }, -}; - -static struct qcom_icc_node qnm_pcie = { - .name = "qnm_pcie", - .id = SA8775P_MASTER_ANOC_PCIE_GEM_NOC, +static struct qcom_icc_node qhs_imem_cfg = { + .name = "qhs_imem_cfg", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 32, - .num_links = 2, - .links = { SA8775P_SLAVE_GEM_NOC_CNOC, - SA8775P_SLAVE_LLCC - }, + .buswidth = 4, }; -static struct qcom_icc_node qnm_snoc_gc = { - .name = "qnm_snoc_gc", - .id = SA8775P_MASTER_SNOC_GC_MEM_NOC, +static struct qcom_icc_node qhs_ipa = { + .name = "qhs_ipa", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 8, - .num_links = 1, - .links = { SA8775P_SLAVE_LLCC }, + .buswidth = 4, }; -static struct qcom_icc_node qnm_snoc_sf = { - .name = "qnm_snoc_sf", - .id = SA8775P_MASTER_SNOC_SF_MEM_NOC, +static struct qcom_icc_node qhs_ipc_router = { + .name = "qhs_ipc_router", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 16, - .num_links = 3, - .links = { SA8775P_SLAVE_GEM_NOC_CNOC, - SA8775P_SLAVE_LLCC, - SA8775P_SLAVE_GEM_NOC_PCIE_CNOC }, + .buswidth = 4, }; -static struct qcom_icc_node qxm_dsp0 = { - .name = "qxm_dsp0", - .id = SA8775P_MASTER_DSP0, +static struct qcom_icc_node qhs_lpass_throttle_cfg = { + .name = "qhs_lpass_throttle_cfg", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 16, - .num_links = 1, - .links = { SA8775P_SLAVE_GP_DSP_SAIL_NOC }, + .buswidth = 4, }; -static struct qcom_icc_node qxm_dsp1 = { - .name = "qxm_dsp1", - .id = SA8775P_MASTER_DSP1, +static struct qcom_icc_node qhs_mx_rdpm = { + .name = "qhs_mx_rdpm", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 16, - .num_links = 1, - .links = { SA8775P_SLAVE_GP_DSP_SAIL_NOC }, + .buswidth = 4, }; -static struct qcom_icc_node qhm_config_noc = { - .name = "qhm_config_noc", - .id = SA8775P_MASTER_CNOC_LPASS_AG_NOC, +static struct qcom_icc_node qhs_mxc_rdpm = { + .name = "qhs_mxc_rdpm", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, - .num_links = 6, - .links = { SA8775P_SLAVE_LPASS_CORE_CFG, - SA8775P_SLAVE_LPASS_LPI_CFG, - SA8775P_SLAVE_LPASS_MPU_CFG, - SA8775P_SLAVE_LPASS_TOP_CFG, - SA8775P_SLAVE_SERVICES_LPASS_AML_NOC, - SA8775P_SLAVE_SERVICE_LPASS_AG_NOC - }, }; -static struct qcom_icc_node qxm_lpass_dsp = { - .name = "qxm_lpass_dsp", - .id = SA8775P_MASTER_LPASS_PROC, +static struct qcom_icc_node qhs_pcie0_cfg = { + .name = "qhs_pcie0_cfg", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 8, - .num_links = 4, - .links = { SA8775P_SLAVE_LPASS_TOP_CFG, - SA8775P_SLAVE_LPASS_SNOC, - SA8775P_SLAVE_SERVICES_LPASS_AML_NOC, - SA8775P_SLAVE_SERVICE_LPASS_AG_NOC - }, -}; - -static struct qcom_icc_node llcc_mc = { - .name = "llcc_mc", - .id = SA8775P_MASTER_LLCC, - .channels = 8, .buswidth = 4, - .num_links = 1, - .links = { SA8775P_SLAVE_EBI1 }, }; -static struct qcom_icc_node qnm_camnoc_hf = { - .name = "qnm_camnoc_hf", - .id = SA8775P_MASTER_CAMNOC_HF, +static struct qcom_icc_node qhs_pcie1_cfg = { + .name = "qhs_pcie1_cfg", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 32, - .num_links = 1, - .links = { SA8775P_SLAVE_MNOC_HF_MEM_NOC }, + .buswidth = 4, }; -static struct qcom_icc_node qnm_camnoc_icp = { - .name = "qnm_camnoc_icp", - .id = SA8775P_MASTER_CAMNOC_ICP, +static struct qcom_icc_node qhs_pcie_rsc_cfg = { + .name = "qhs_pcie_rsc_cfg", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 8, - .num_links = 1, - .links = { SA8775P_SLAVE_MNOC_SF_MEM_NOC }, + .buswidth = 4, }; -static struct qcom_icc_node qnm_camnoc_sf = { - .name = "qnm_camnoc_sf", - .id = SA8775P_MASTER_CAMNOC_SF, +static struct qcom_icc_node qhs_pcie_tcu_throttle_cfg = { + .name = "qhs_pcie_tcu_throttle_cfg", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 32, - .num_links = 1, - .links = { SA8775P_SLAVE_MNOC_SF_MEM_NOC }, + .buswidth = 4, }; -static struct qcom_icc_node qnm_mdp0_0 = { - .name = "qnm_mdp0_0", - .id = SA8775P_MASTER_MDP0, +static struct qcom_icc_node qhs_pcie_throttle_cfg = { + .name = "qhs_pcie_throttle_cfg", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 32, - .num_links = 1, - .links = { SA8775P_SLAVE_MNOC_HF_MEM_NOC }, + .buswidth = 4, }; -static struct qcom_icc_node qnm_mdp0_1 = { - .name = "qnm_mdp0_1", - .id = SA8775P_MASTER_MDP1, +static struct qcom_icc_node qhs_pdm = { + .name = "qhs_pdm", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 32, - .num_links = 1, - .links = { SA8775P_SLAVE_MNOC_HF_MEM_NOC }, + .buswidth = 4, }; -static struct qcom_icc_node qnm_mdp1_0 = { - .name = "qnm_mdp1_0", - .id = SA8775P_MASTER_MDP_CORE1_0, +static struct qcom_icc_node qhs_pimem_cfg = { + .name = "qhs_pimem_cfg", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 32, - .num_links = 1, - .links = { SA8775P_SLAVE_MNOC_HF_MEM_NOC }, + .buswidth = 4, }; -static struct qcom_icc_node qnm_mdp1_1 = { - .name = "qnm_mdp1_1", - .id = SA8775P_MASTER_MDP_CORE1_1, +static struct qcom_icc_node qhs_pke_wrapper_cfg = { + .name = "qhs_pke_wrapper_cfg", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 32, - .num_links = 1, - .links = { SA8775P_SLAVE_MNOC_HF_MEM_NOC }, + .buswidth = 4, }; -static struct qcom_icc_node qnm_mnoc_hf_cfg = { - .name = "qnm_mnoc_hf_cfg", - .id = SA8775P_MASTER_CNOC_MNOC_HF_CFG, +static struct qcom_icc_node qhs_qdss_cfg = { + .name = "qhs_qdss_cfg", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, - .num_links = 1, - .links = { SA8775P_SLAVE_SERVICE_MNOC_HF }, }; -static struct qcom_icc_node qnm_mnoc_sf_cfg = { - .name = "qnm_mnoc_sf_cfg", - .id = SA8775P_MASTER_CNOC_MNOC_SF_CFG, +static struct qcom_icc_node qhs_qm_cfg = { + .name = "qhs_qm_cfg", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, - .num_links = 1, - .links = { SA8775P_SLAVE_SERVICE_MNOC_SF }, }; -static struct qcom_icc_node qnm_video0 = { - .name = "qnm_video0", - .id = SA8775P_MASTER_VIDEO_P0, +static struct qcom_icc_node qhs_qm_mpu_cfg = { + .name = "qhs_qm_mpu_cfg", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 32, - .num_links = 1, - .links = { SA8775P_SLAVE_MNOC_SF_MEM_NOC }, + .buswidth = 4, }; -static struct qcom_icc_node qnm_video1 = { - .name = "qnm_video1", - .id = SA8775P_MASTER_VIDEO_P1, +static struct qcom_icc_node qhs_qup0 = { + .name = "qhs_qup0", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 32, - .num_links = 1, - .links = { SA8775P_SLAVE_MNOC_SF_MEM_NOC }, + .buswidth = 4, }; -static struct qcom_icc_node qnm_video_cvp = { - .name = "qnm_video_cvp", - .id = SA8775P_MASTER_VIDEO_PROC, +static struct qcom_icc_node qhs_qup1 = { + .name = "qhs_qup1", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 32, - .num_links = 1, - .links = { SA8775P_SLAVE_MNOC_SF_MEM_NOC }, + .buswidth = 4, }; -static struct qcom_icc_node qnm_video_v_cpu = { - .name = "qnm_video_v_cpu", - .id = SA8775P_MASTER_VIDEO_V_PROC, +static struct qcom_icc_node qhs_qup2 = { + .name = "qhs_qup2", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 8, - .num_links = 1, - .links = { SA8775P_SLAVE_MNOC_SF_MEM_NOC }, + .buswidth = 4, }; -static struct qcom_icc_node qhm_nsp_noc_config = { - .name = "qhm_nsp_noc_config", - .id = SA8775P_MASTER_CDSP_NOC_CFG, +static struct qcom_icc_node qhs_qup3 = { + .name = "qhs_qup3", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, - .num_links = 1, - .links = { SA8775P_SLAVE_SERVICE_NSP_NOC }, -}; - -static struct qcom_icc_node qxm_nsp = { - .name = "qxm_nsp", - .id = SA8775P_MASTER_CDSP_PROC, - .channels = 2, - .buswidth = 32, - .num_links = 2, - .links = { SA8775P_SLAVE_HCP_A, SLAVE_CDSP_MEM_NOC }, }; -static struct qcom_icc_node qhm_nspb_noc_config = { - .name = "qhm_nspb_noc_config", - .id = SA8775P_MASTER_CDSPB_NOC_CFG, +static struct qcom_icc_node qhs_sail_throttle_cfg = { + .name = "qhs_sail_throttle_cfg", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, - .num_links = 1, - .links = { SA8775P_SLAVE_SERVICE_NSPB_NOC }, -}; - -static struct qcom_icc_node qxm_nspb = { - .name = "qxm_nspb", - .id = SA8775P_MASTER_CDSP_PROC_B, - .channels = 2, - .buswidth = 32, - .num_links = 2, - .links = { SA8775P_SLAVE_HCP_B, SLAVE_CDSPB_MEM_NOC }, }; -static struct qcom_icc_node xm_pcie3_0 = { - .name = "xm_pcie3_0", - .id = SA8775P_MASTER_PCIE_0, +static struct qcom_icc_node qhs_sdc1 = { + .name = "qhs_sdc1", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 16, - .num_links = 1, - .links = { SA8775P_SLAVE_ANOC_PCIE_GEM_NOC }, + .buswidth = 4, }; -static struct qcom_icc_node xm_pcie3_1 = { - .name = "xm_pcie3_1", - .id = SA8775P_MASTER_PCIE_1, +static struct qcom_icc_node qhs_security = { + .name = "qhs_security", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 32, - .num_links = 1, - .links = { SA8775P_SLAVE_ANOC_PCIE_GEM_NOC }, + .buswidth = 4, }; -static struct qcom_icc_node qhm_gic = { - .name = "qhm_gic", - .id = SA8775P_MASTER_GIC_AHB, +static struct qcom_icc_node qhs_snoc_throttle_cfg = { + .name = "qhs_snoc_throttle_cfg", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, - .num_links = 1, - .links = { SA8775P_SLAVE_SNOC_GEM_NOC_SF }, }; -static struct qcom_icc_node qnm_aggre1_noc = { - .name = "qnm_aggre1_noc", - .id = SA8775P_MASTER_A1NOC_SNOC, +static struct qcom_icc_node qhs_tcsr = { + .name = "qhs_tcsr", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 32, - .num_links = 1, - .links = { SA8775P_SLAVE_SNOC_GEM_NOC_SF }, + .buswidth = 4, }; -static struct qcom_icc_node qnm_aggre2_noc = { - .name = "qnm_aggre2_noc", - .id = SA8775P_MASTER_A2NOC_SNOC, +static struct qcom_icc_node qhs_tlmm = { + .name = "qhs_tlmm", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 16, - .num_links = 1, - .links = { SA8775P_SLAVE_SNOC_GEM_NOC_SF }, + .buswidth = 4, }; -static struct qcom_icc_node qnm_lpass_noc = { - .name = "qnm_lpass_noc", - .id = SA8775P_MASTER_LPASS_ANOC, +static struct qcom_icc_node qhs_tsc_cfg = { + .name = "qhs_tsc_cfg", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 16, - .num_links = 1, - .links = { SA8775P_SLAVE_SNOC_GEM_NOC_SF }, + .buswidth = 4, }; -static struct qcom_icc_node qnm_snoc_cfg = { - .name = "qnm_snoc_cfg", - .id = SA8775P_MASTER_SNOC_CFG, +static struct qcom_icc_node qhs_ufs_card_cfg = { + .name = "qhs_ufs_card_cfg", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, - .num_links = 1, - .links = { SA8775P_SLAVE_SERVICE_SNOC }, }; -static struct qcom_icc_node qxm_pimem = { - .name = "qxm_pimem", - .id = SA8775P_MASTER_PIMEM, +static struct qcom_icc_node qhs_ufs_mem_cfg = { + .name = "qhs_ufs_mem_cfg", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 8, - .num_links = 1, - .links = { SA8775P_SLAVE_SNOC_GEM_NOC_GC }, + .buswidth = 4, }; -static struct qcom_icc_node xm_gic = { - .name = "xm_gic", - .id = SA8775P_MASTER_GIC, +static struct qcom_icc_node qhs_usb2_0 = { + .name = "qhs_usb2_0", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 8, - .num_links = 1, - .links = { SA8775P_SLAVE_SNOC_GEM_NOC_GC }, + .buswidth = 4, }; -static struct qcom_icc_node qns_a1noc_snoc = { - .name = "qns_a1noc_snoc", - .id = SA8775P_SLAVE_A1NOC_SNOC, +static struct qcom_icc_node qhs_usb3_0 = { + .name = "qhs_usb3_0", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 32, - .num_links = 1, - .links = { SA8775P_MASTER_A1NOC_SNOC }, + .buswidth = 4, }; -static struct qcom_icc_node qns_a2noc_snoc = { - .name = "qns_a2noc_snoc", - .id = SA8775P_SLAVE_A2NOC_SNOC, +static struct qcom_icc_node qhs_usb3_1 = { + .name = "qhs_usb3_1", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 16, - .num_links = 1, - .links = { SA8775P_MASTER_A2NOC_SNOC }, + .buswidth = 4, }; -static struct qcom_icc_node qup0_core_slave = { - .name = "qup0_core_slave", - .id = SA8775P_SLAVE_QUP_CORE_0, +static struct qcom_icc_node qhs_venus_cfg = { + .name = "qhs_venus_cfg", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, }; -static struct qcom_icc_node qup1_core_slave = { - .name = "qup1_core_slave", - .id = SA8775P_SLAVE_QUP_CORE_1, +static struct qcom_icc_node qhs_venus_cvp_throttle_cfg = { + .name = "qhs_venus_cvp_throttle_cfg", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, }; -static struct qcom_icc_node qup2_core_slave = { - .name = "qup2_core_slave", - .id = SA8775P_SLAVE_QUP_CORE_2, +static struct qcom_icc_node qhs_venus_v_cpu_throttle_cfg = { + .name = "qhs_venus_v_cpu_throttle_cfg", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, }; -static struct qcom_icc_node qup3_core_slave = { - .name = "qup3_core_slave", - .id = SA8775P_SLAVE_QUP_CORE_3, +static struct qcom_icc_node qhs_venus_vcodec_throttle_cfg = { + .name = "qhs_venus_vcodec_throttle_cfg", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, }; -static struct qcom_icc_node qhs_ahb2phy0 = { - .name = "qhs_ahb2phy0", - .id = SA8775P_SLAVE_AHB2PHY_0, +static struct qcom_icc_node qns_gpdsp_noc_cfg = { + .name = "qns_gpdsp_noc_cfg", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, }; -static struct qcom_icc_node qhs_ahb2phy1 = { - .name = "qhs_ahb2phy1", - .id = SA8775P_SLAVE_AHB2PHY_1, +static struct qcom_icc_node qns_pcie_anoc_cfg = { + .name = "qns_pcie_anoc_cfg", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, }; -static struct qcom_icc_node qhs_ahb2phy2 = { - .name = "qhs_ahb2phy2", - .id = SA8775P_SLAVE_AHB2PHY_2, +static struct qcom_icc_node qxs_boot_imem = { + .name = "qxs_boot_imem", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 16, }; -static struct qcom_icc_node qhs_ahb2phy3 = { - .name = "qhs_ahb2phy3", - .id = SA8775P_SLAVE_AHB2PHY_3, +static struct qcom_icc_node qxs_imem = { + .name = "qxs_imem", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 8, }; -static struct qcom_icc_node qhs_anoc_throttle_cfg = { - .name = "qhs_anoc_throttle_cfg", - .id = SA8775P_SLAVE_ANOC_THROTTLE_CFG, +static struct qcom_icc_node qxs_pimem = { + .name = "qxs_pimem", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 8, }; -static struct qcom_icc_node qhs_aoss = { - .name = "qhs_aoss", - .id = SA8775P_SLAVE_AOSS, +static struct qcom_icc_node xs_pcie_0 = { + .name = "xs_pcie_0", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 16, }; -static struct qcom_icc_node qhs_apss = { - .name = "qhs_apss", - .id = SA8775P_SLAVE_APPSS, +static struct qcom_icc_node xs_pcie_1 = { + .name = "xs_pcie_1", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 8, + .buswidth = 32, }; -static struct qcom_icc_node qhs_boot_rom = { - .name = "qhs_boot_rom", - .id = SA8775P_SLAVE_BOOT_ROM, +static struct qcom_icc_node xs_qdss_stm = { + .name = "xs_qdss_stm", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, }; -static struct qcom_icc_node qhs_camera_cfg = { - .name = "qhs_camera_cfg", - .id = SA8775P_SLAVE_CAMERA_CFG, +static struct qcom_icc_node xs_sys_tcu_cfg = { + .name = "xs_sys_tcu_cfg", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 8, }; -static struct qcom_icc_node qhs_camera_nrt_throttle_cfg = { - .name = "qhs_camera_nrt_throttle_cfg", - .id = SA8775P_SLAVE_CAMERA_NRT_THROTTLE_CFG, +static struct qcom_icc_node qhs_llcc = { + .name = "qhs_llcc", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, }; -static struct qcom_icc_node qhs_camera_rt_throttle_cfg = { - .name = "qhs_camera_rt_throttle_cfg", - .id = SA8775P_SLAVE_CAMERA_RT_THROTTLE_CFG, +static struct qcom_icc_node srvc_even_gemnoc = { + .name = "srvc_even_gemnoc", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, }; -static struct qcom_icc_node qhs_clk_ctl = { - .name = "qhs_clk_ctl", - .id = SA8775P_SLAVE_CLK_CTL, +static struct qcom_icc_node srvc_odd_gemnoc = { + .name = "srvc_odd_gemnoc", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, }; -static struct qcom_icc_node qhs_compute0_cfg = { - .name = "qhs_compute0_cfg", - .id = SA8775P_SLAVE_CDSP_CFG, +static struct qcom_icc_node srvc_sys_gemnoc = { + .name = "srvc_sys_gemnoc", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, - .num_links = 1, - .links = { SA8775P_MASTER_CDSP_NOC_CFG }, }; -static struct qcom_icc_node qhs_compute1_cfg = { - .name = "qhs_compute1_cfg", - .id = SA8775P_SLAVE_CDSP1_CFG, +static struct qcom_icc_node srvc_sys_gemnoc_2 = { + .name = "srvc_sys_gemnoc_2", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, - .num_links = 1, - .links = { SA8775P_MASTER_CDSPB_NOC_CFG }, }; -static struct qcom_icc_node qhs_cpr_cx = { - .name = "qhs_cpr_cx", - .id = SA8775P_SLAVE_RBCPR_CX_CFG, +static struct qcom_icc_node qhs_lpass_core = { + .name = "qhs_lpass_core", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, }; -static struct qcom_icc_node qhs_cpr_mmcx = { - .name = "qhs_cpr_mmcx", - .id = SA8775P_SLAVE_RBCPR_MMCX_CFG, +static struct qcom_icc_node qhs_lpass_lpi = { + .name = "qhs_lpass_lpi", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, }; -static struct qcom_icc_node qhs_cpr_mx = { - .name = "qhs_cpr_mx", - .id = SA8775P_SLAVE_RBCPR_MX_CFG, +static struct qcom_icc_node qhs_lpass_mpu = { + .name = "qhs_lpass_mpu", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, }; -static struct qcom_icc_node qhs_cpr_nspcx = { - .name = "qhs_cpr_nspcx", - .id = SA8775P_SLAVE_CPR_NSPCX, +static struct qcom_icc_node qhs_lpass_top = { + .name = "qhs_lpass_top", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, }; -static struct qcom_icc_node qhs_crypto0_cfg = { - .name = "qhs_crypto0_cfg", - .id = SA8775P_SLAVE_CRYPTO_0_CFG, +static struct qcom_icc_node srvc_niu_aml_noc = { + .name = "srvc_niu_aml_noc", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, }; -static struct qcom_icc_node qhs_cx_rdpm = { - .name = "qhs_cx_rdpm", - .id = SA8775P_SLAVE_CX_RDPM, +static struct qcom_icc_node srvc_niu_lpass_agnoc = { + .name = "srvc_niu_lpass_agnoc", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, }; -static struct qcom_icc_node qhs_display0_cfg = { - .name = "qhs_display0_cfg", - .id = SA8775P_SLAVE_DISPLAY_CFG, - .channels = 1, +static struct qcom_icc_node ebi = { + .name = "ebi", + .id = ALLOC_DYN_ID, + .channels = 8, .buswidth = 4, }; -static struct qcom_icc_node qhs_display0_rt_throttle_cfg = { - .name = "qhs_display0_rt_throttle_cfg", - .id = SA8775P_SLAVE_DISPLAY_RT_THROTTLE_CFG, +static struct qcom_icc_node srvc_mnoc_hf = { + .name = "srvc_mnoc_hf", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, }; -static struct qcom_icc_node qhs_display1_cfg = { - .name = "qhs_display1_cfg", - .id = SA8775P_SLAVE_DISPLAY1_CFG, +static struct qcom_icc_node srvc_mnoc_sf = { + .name = "srvc_mnoc_sf", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, }; -static struct qcom_icc_node qhs_display1_rt_throttle_cfg = { - .name = "qhs_display1_rt_throttle_cfg", - .id = SA8775P_SLAVE_DISPLAY1_RT_THROTTLE_CFG, - .channels = 1, - .buswidth = 4, +static struct qcom_icc_node qns_hcp = { + .name = "qns_hcp", + .id = ALLOC_DYN_ID, + .channels = 2, + .buswidth = 32, }; -static struct qcom_icc_node qhs_emac0_cfg = { - .name = "qhs_emac0_cfg", - .id = SA8775P_SLAVE_EMAC_CFG, +static struct qcom_icc_node service_nsp_noc = { + .name = "service_nsp_noc", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, }; -static struct qcom_icc_node qhs_emac1_cfg = { - .name = "qhs_emac1_cfg", - .id = SA8775P_SLAVE_EMAC1_CFG, +static struct qcom_icc_node qns_nspb_hcp = { + .name = "qns_nspb_hcp", + .id = ALLOC_DYN_ID, + .channels = 2, + .buswidth = 32, +}; + +static struct qcom_icc_node service_nspb_noc = { + .name = "service_nspb_noc", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, }; -static struct qcom_icc_node qhs_gp_dsp0_cfg = { - .name = "qhs_gp_dsp0_cfg", - .id = SA8775P_SLAVE_GP_DSP0_CFG, +static struct qcom_icc_node srvc_snoc = { + .name = "srvc_snoc", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, }; -static struct qcom_icc_node qhs_gp_dsp1_cfg = { - .name = "qhs_gp_dsp1_cfg", - .id = SA8775P_SLAVE_GP_DSP1_CFG, +static struct qcom_icc_node qup0_core_master = { + .name = "qup0_core_master", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, + .num_links = 1, + .link_nodes = { &qup0_core_slave }, }; -static struct qcom_icc_node qhs_gpdsp0_throttle_cfg = { - .name = "qhs_gpdsp0_throttle_cfg", - .id = SA8775P_SLAVE_GPDSP0_THROTTLE_CFG, +static struct qcom_icc_node qup1_core_master = { + .name = "qup1_core_master", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, + .num_links = 1, + .link_nodes = { &qup1_core_slave }, }; -static struct qcom_icc_node qhs_gpdsp1_throttle_cfg = { - .name = "qhs_gpdsp1_throttle_cfg", - .id = SA8775P_SLAVE_GPDSP1_THROTTLE_CFG, +static struct qcom_icc_node qup2_core_master = { + .name = "qup2_core_master", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, + .num_links = 1, + .link_nodes = { &qup2_core_slave }, }; -static struct qcom_icc_node qhs_gpu_tcu_throttle_cfg = { - .name = "qhs_gpu_tcu_throttle_cfg", - .id = SA8775P_SLAVE_GPU_TCU_THROTTLE_CFG, +static struct qcom_icc_node qup3_core_master = { + .name = "qup3_core_master", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, + .num_links = 1, + .link_nodes = { &qup3_core_slave }, }; -static struct qcom_icc_node qhs_gpuss_cfg = { - .name = "qhs_gpuss_cfg", - .id = SA8775P_SLAVE_GFX3D_CFG, +static struct qcom_icc_node qnm_gemnoc_pcie = { + .name = "qnm_gemnoc_pcie", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 8, + .buswidth = 16, + .num_links = 2, + .link_nodes = { &xs_pcie_0, &xs_pcie_1 }, }; -static struct qcom_icc_node qhs_hwkm = { - .name = "qhs_hwkm", - .id = SA8775P_SLAVE_HWKM, +static struct qcom_icc_node qnm_gemnoc_cfg = { + .name = "qnm_gemnoc_cfg", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, + .num_links = 4, + .link_nodes = { &srvc_even_gemnoc, &srvc_odd_gemnoc, + &srvc_sys_gemnoc, &srvc_sys_gemnoc_2 }, }; -static struct qcom_icc_node qhs_imem_cfg = { - .name = "qhs_imem_cfg", - .id = SA8775P_SLAVE_IMEM_CFG, +static struct qcom_icc_node qhm_config_noc = { + .name = "qhm_config_noc", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, + .num_links = 6, + .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 qhs_ipa = { - .name = "qhs_ipa", - .id = SA8775P_SLAVE_IPA_CFG, - .channels = 1, +static struct qcom_icc_node llcc_mc = { + .name = "llcc_mc", + .id = ALLOC_DYN_ID, + .channels = 8, .buswidth = 4, + .num_links = 1, + .link_nodes = { &ebi }, }; -static struct qcom_icc_node qhs_ipc_router = { - .name = "qhs_ipc_router", - .id = SA8775P_SLAVE_IPC_ROUTER_CFG, +static struct qcom_icc_node qnm_mnoc_hf_cfg = { + .name = "qnm_mnoc_hf_cfg", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, + .num_links = 1, + .link_nodes = { &srvc_mnoc_hf }, }; -static struct qcom_icc_node qhs_lpass_cfg = { - .name = "qhs_lpass_cfg", - .id = SA8775P_SLAVE_LPASS, +static struct qcom_icc_node qnm_mnoc_sf_cfg = { + .name = "qnm_mnoc_sf_cfg", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, .num_links = 1, - .links = { SA8775P_MASTER_CNOC_LPASS_AG_NOC }, + .link_nodes = { &srvc_mnoc_sf }, }; -static struct qcom_icc_node qhs_lpass_throttle_cfg = { - .name = "qhs_lpass_throttle_cfg", - .id = SA8775P_SLAVE_LPASS_THROTTLE_CFG, +static struct qcom_icc_node qhm_nsp_noc_config = { + .name = "qhm_nsp_noc_config", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, + .num_links = 1, + .link_nodes = { &service_nsp_noc }, }; -static struct qcom_icc_node qhs_mx_rdpm = { - .name = "qhs_mx_rdpm", - .id = SA8775P_SLAVE_MX_RDPM, +static struct qcom_icc_node qhm_nspb_noc_config = { + .name = "qhm_nspb_noc_config", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, + .num_links = 1, + .link_nodes = { &service_nspb_noc }, }; -static struct qcom_icc_node qhs_mxc_rdpm = { - .name = "qhs_mxc_rdpm", - .id = SA8775P_SLAVE_MXC_RDPM, +static struct qcom_icc_node qnm_snoc_cfg = { + .name = "qnm_snoc_cfg", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, + .num_links = 1, + .link_nodes = { &srvc_snoc }, }; -static struct qcom_icc_node qhs_pcie0_cfg = { - .name = "qhs_pcie0_cfg", - .id = SA8775P_SLAVE_PCIE_0_CFG, +static struct qcom_icc_node qhs_compute0_cfg = { + .name = "qhs_compute0_cfg", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, + .num_links = 1, + .link_nodes = { &qhm_nsp_noc_config }, }; -static struct qcom_icc_node qhs_pcie1_cfg = { - .name = "qhs_pcie1_cfg", - .id = SA8775P_SLAVE_PCIE_1_CFG, +static struct qcom_icc_node qhs_compute1_cfg = { + .name = "qhs_compute1_cfg", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, + .num_links = 1, + .link_nodes = { &qhm_nspb_noc_config }, }; -static struct qcom_icc_node qhs_pcie_rsc_cfg = { - .name = "qhs_pcie_rsc_cfg", - .id = SA8775P_SLAVE_PCIE_RSC_CFG, +static struct qcom_icc_node qhs_lpass_cfg = { + .name = "qhs_lpass_cfg", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, + .num_links = 1, + .link_nodes = { &qhm_config_noc }, }; -static struct qcom_icc_node qhs_pcie_tcu_throttle_cfg = { - .name = "qhs_pcie_tcu_throttle_cfg", - .id = SA8775P_SLAVE_PCIE_TCU_THROTTLE_CFG, +static struct qcom_icc_node qns_mnoc_hf_cfg = { + .name = "qns_mnoc_hf_cfg", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, + .num_links = 1, + .link_nodes = { &qnm_mnoc_hf_cfg }, }; -static struct qcom_icc_node qhs_pcie_throttle_cfg = { - .name = "qhs_pcie_throttle_cfg", - .id = SA8775P_SLAVE_PCIE_THROTTLE_CFG, +static struct qcom_icc_node qns_mnoc_sf_cfg = { + .name = "qns_mnoc_sf_cfg", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, + .num_links = 1, + .link_nodes = { &qnm_mnoc_sf_cfg }, }; -static struct qcom_icc_node qhs_pdm = { - .name = "qhs_pdm", - .id = SA8775P_SLAVE_PDM, +static struct qcom_icc_node qns_snoc_cfg = { + .name = "qns_snoc_cfg", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, + .num_links = 1, + .link_nodes = { &qnm_snoc_cfg }, }; -static struct qcom_icc_node qhs_pimem_cfg = { - .name = "qhs_pimem_cfg", - .id = SA8775P_SLAVE_PIMEM_CFG, +static struct qcom_icc_node qns_gemnoc = { + .name = "qns_gemnoc", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, + .num_links = 1, + .link_nodes = { &qnm_gemnoc_cfg }, }; -static struct qcom_icc_node qhs_pke_wrapper_cfg = { - .name = "qhs_pke_wrapper_cfg", - .id = SA8775P_SLAVE_PKA_WRAPPER_CFG, - .channels = 1, - .buswidth = 4, +static struct qcom_icc_node qns_llcc = { + .name = "qns_llcc", + .id = ALLOC_DYN_ID, + .channels = 6, + .buswidth = 16, + .num_links = 1, + .link_nodes = { &llcc_mc }, }; -static struct qcom_icc_node qhs_qdss_cfg = { - .name = "qhs_qdss_cfg", - .id = SA8775P_SLAVE_QDSS_CFG, +static struct qcom_icc_node qns_pcie = { + .name = "qns_pcie", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 16, + .num_links = 1, + .link_nodes = { &qnm_gemnoc_pcie }, }; -static struct qcom_icc_node qhs_qm_cfg = { - .name = "qhs_qm_cfg", - .id = SA8775P_SLAVE_QM_CFG, +static struct qcom_icc_node qnm_cnoc_dc_noc = { + .name = "qnm_cnoc_dc_noc", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, + .num_links = 2, + .link_nodes = { &qhs_llcc, &qns_gemnoc }, }; -static struct qcom_icc_node qhs_qm_mpu_cfg = { - .name = "qhs_qm_mpu_cfg", - .id = SA8775P_SLAVE_QM_MPU_CFG, - .channels = 1, - .buswidth = 4, +static struct qcom_icc_node qnm_mnoc_hf = { + .name = "qnm_mnoc_hf", + .id = ALLOC_DYN_ID, + .channels = 2, + .buswidth = 32, + .num_links = 2, + .link_nodes = { &qns_llcc, &qns_pcie }, }; -static struct qcom_icc_node qhs_qup0 = { - .name = "qhs_qup0", - .id = SA8775P_SLAVE_QUP_0, +static struct qcom_icc_node qnm_snoc_gc = { + .name = "qnm_snoc_gc", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 8, + .num_links = 1, + .link_nodes = { &qns_llcc }, }; -static struct qcom_icc_node qhs_qup1 = { - .name = "qhs_qup1", - .id = SA8775P_SLAVE_QUP_1, +static struct qcom_icc_node qns_ddrss_cfg = { + .name = "qns_ddrss_cfg", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, + .num_links = 1, + .link_nodes = { &qnm_cnoc_dc_noc }, }; -static struct qcom_icc_node qhs_qup2 = { - .name = "qhs_qup2", - .id = SA8775P_SLAVE_QUP_2, +static struct qcom_icc_node qns_mem_noc_hf = { + .name = "qns_mem_noc_hf", + .id = ALLOC_DYN_ID, + .channels = 2, + .buswidth = 32, + .num_links = 1, + .link_nodes = { &qnm_mnoc_hf }, +}; + +static struct qcom_icc_node qns_gemnoc_gc = { + .name = "qns_gemnoc_gc", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 8, + .num_links = 1, + .link_nodes = { &qnm_snoc_gc }, }; -static struct qcom_icc_node qhs_qup3 = { - .name = "qhs_qup3", - .id = SA8775P_SLAVE_QUP_3, +static struct qcom_icc_node qnm_gemnoc_cnoc = { + .name = "qnm_gemnoc_cnoc", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 16, + .num_links = 82, + .link_nodes = { &qhs_ahb2phy0, &qhs_ahb2phy1, + &qhs_ahb2phy2, &qhs_ahb2phy3, + &qhs_anoc_throttle_cfg, &qhs_aoss, + &qhs_apss, &qhs_boot_rom, + &qhs_camera_cfg, &qhs_camera_nrt_throttle_cfg, + &qhs_camera_rt_throttle_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_display0_cfg, &qhs_display0_rt_throttle_cfg, + &qhs_display1_cfg, &qhs_display1_rt_throttle_cfg, + &qhs_emac0_cfg, &qhs_emac1_cfg, + &qhs_gp_dsp0_cfg, &qhs_gp_dsp1_cfg, + &qhs_gpdsp0_throttle_cfg, &qhs_gpdsp1_throttle_cfg, + &qhs_gpu_tcu_throttle_cfg, &qhs_gpuss_cfg, + &qhs_hwkm, &qhs_imem_cfg, + &qhs_ipa, &qhs_ipc_router, + &qhs_lpass_cfg, &qhs_lpass_throttle_cfg, + &qhs_mx_rdpm, &qhs_mxc_rdpm, + &qhs_pcie0_cfg, &qhs_pcie1_cfg, + &qhs_pcie_rsc_cfg, &qhs_pcie_tcu_throttle_cfg, + &qhs_pcie_throttle_cfg, &qhs_pdm, + &qhs_pimem_cfg, &qhs_pke_wrapper_cfg, + &qhs_qdss_cfg, &qhs_qm_cfg, + &qhs_qm_mpu_cfg, &qhs_qup0, + &qhs_qup1, &qhs_qup2, + &qhs_qup3, &qhs_sail_throttle_cfg, + &qhs_sdc1, &qhs_security, + &qhs_snoc_throttle_cfg, &qhs_tcsr, + &qhs_tlmm, &qhs_tsc_cfg, + &qhs_ufs_card_cfg, &qhs_ufs_mem_cfg, + &qhs_usb2_0, &qhs_usb3_0, + &qhs_usb3_1, &qhs_venus_cfg, + &qhs_venus_cvp_throttle_cfg, &qhs_venus_v_cpu_throttle_cfg, + &qhs_venus_vcodec_throttle_cfg, &qns_ddrss_cfg, + &qns_gpdsp_noc_cfg, &qns_mnoc_hf_cfg, + &qns_mnoc_sf_cfg, &qns_pcie_anoc_cfg, + &qns_snoc_cfg, &qxs_boot_imem, + &qxs_imem, &qxs_pimem, + &xs_qdss_stm, &xs_sys_tcu_cfg }, }; -static struct qcom_icc_node qhs_sail_throttle_cfg = { - .name = "qhs_sail_throttle_cfg", - .id = SA8775P_SLAVE_SAIL_THROTTLE_CFG, +static struct qcom_icc_node qnm_camnoc_hf = { + .name = "qnm_camnoc_hf", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 32, + .num_links = 1, + .link_nodes = { &qns_mem_noc_hf }, }; -static struct qcom_icc_node qhs_sdc1 = { - .name = "qhs_sdc1", - .id = SA8775P_SLAVE_SDC1, +static struct qcom_icc_node qnm_mdp0_0 = { + .name = "qnm_mdp0_0", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 32, + .num_links = 1, + .link_nodes = { &qns_mem_noc_hf }, }; -static struct qcom_icc_node qhs_security = { - .name = "qhs_security", - .id = SA8775P_SLAVE_SECURITY, +static struct qcom_icc_node qnm_mdp0_1 = { + .name = "qnm_mdp0_1", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 32, + .num_links = 1, + .link_nodes = { &qns_mem_noc_hf }, }; -static struct qcom_icc_node qhs_snoc_throttle_cfg = { - .name = "qhs_snoc_throttle_cfg", - .id = SA8775P_SLAVE_SNOC_THROTTLE_CFG, +static struct qcom_icc_node qnm_mdp1_0 = { + .name = "qnm_mdp1_0", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 32, + .num_links = 1, + .link_nodes = { &qns_mem_noc_hf }, }; -static struct qcom_icc_node qhs_tcsr = { - .name = "qhs_tcsr", - .id = SA8775P_SLAVE_TCSR, +static struct qcom_icc_node qnm_mdp1_1 = { + .name = "qnm_mdp1_1", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 32, + .num_links = 1, + .link_nodes = { &qns_mem_noc_hf }, }; -static struct qcom_icc_node qhs_tlmm = { - .name = "qhs_tlmm", - .id = SA8775P_SLAVE_TLMM, +static struct qcom_icc_node qxm_pimem = { + .name = "qxm_pimem", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 8, + .num_links = 1, + .link_nodes = { &qns_gemnoc_gc }, }; -static struct qcom_icc_node qhs_tsc_cfg = { - .name = "qhs_tsc_cfg", - .id = SA8775P_SLAVE_TSC_CFG, +static struct qcom_icc_node xm_gic = { + .name = "xm_gic", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 8, + .num_links = 1, + .link_nodes = { &qns_gemnoc_gc }, }; -static struct qcom_icc_node qhs_ufs_card_cfg = { - .name = "qhs_ufs_card_cfg", - .id = SA8775P_SLAVE_UFS_CARD_CFG, +static struct qcom_icc_node qns_gem_noc_cnoc = { + .name = "qns_gem_noc_cnoc", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 16, + .num_links = 1, + .link_nodes = { &qnm_gemnoc_cnoc }, }; -static struct qcom_icc_node qhs_ufs_mem_cfg = { - .name = "qhs_ufs_mem_cfg", - .id = SA8775P_SLAVE_UFS_MEM_CFG, +static struct qcom_icc_node alm_gpu_tcu = { + .name = "alm_gpu_tcu", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 8, + .num_links = 2, + .link_nodes = { &qns_gem_noc_cnoc, &qns_llcc }, }; -static struct qcom_icc_node qhs_usb2_0 = { - .name = "qhs_usb2_0", - .id = SA8775P_SLAVE_USB2, +static struct qcom_icc_node alm_pcie_tcu = { + .name = "alm_pcie_tcu", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 8, + .num_links = 2, + .link_nodes = { &qns_gem_noc_cnoc, &qns_llcc }, }; -static struct qcom_icc_node qhs_usb3_0 = { - .name = "qhs_usb3_0", - .id = SA8775P_SLAVE_USB3_0, +static struct qcom_icc_node alm_sys_tcu = { + .name = "alm_sys_tcu", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 8, + .num_links = 2, + .link_nodes = { &qns_gem_noc_cnoc, &qns_llcc }, }; -static struct qcom_icc_node qhs_usb3_1 = { - .name = "qhs_usb3_1", - .id = SA8775P_SLAVE_USB3_1, +static struct qcom_icc_node chm_apps = { + .name = "chm_apps", + .id = ALLOC_DYN_ID, + .channels = 4, + .buswidth = 32, + .num_links = 3, + .link_nodes = { &qns_gem_noc_cnoc, &qns_llcc, + &qns_pcie }, +}; + +static struct qcom_icc_node qnm_cmpnoc0 = { + .name = "qnm_cmpnoc0", + .id = ALLOC_DYN_ID, + .channels = 2, + .buswidth = 32, + .num_links = 2, + .link_nodes = { &qns_gem_noc_cnoc, &qns_llcc }, +}; + +static struct qcom_icc_node qnm_cmpnoc1 = { + .name = "qnm_cmpnoc1", + .id = ALLOC_DYN_ID, + .channels = 2, + .buswidth = 32, + .num_links = 2, + .link_nodes = { &qns_gem_noc_cnoc, &qns_llcc }, +}; + +static struct qcom_icc_node qnm_gpdsp_sail = { + .name = "qnm_gpdsp_sail", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 16, + .num_links = 2, + .link_nodes = { &qns_gem_noc_cnoc, &qns_llcc }, }; -static struct qcom_icc_node qhs_venus_cfg = { - .name = "qhs_venus_cfg", - .id = SA8775P_SLAVE_VENUS_CFG, +static struct qcom_icc_node qnm_gpu = { + .name = "qnm_gpu", + .id = ALLOC_DYN_ID, + .channels = 2, + .buswidth = 32, + .num_links = 2, + .link_nodes = { &qns_gem_noc_cnoc, &qns_llcc }, +}; + +static struct qcom_icc_node qnm_mnoc_sf = { + .name = "qnm_mnoc_sf", + .id = ALLOC_DYN_ID, + .channels = 2, + .buswidth = 32, + .num_links = 3, + .link_nodes = { &qns_gem_noc_cnoc, &qns_llcc, + &qns_pcie }, +}; + +static struct qcom_icc_node qnm_pcie = { + .name = "qnm_pcie", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 32, + .num_links = 2, + .link_nodes = { &qns_gem_noc_cnoc, &qns_llcc }, }; -static struct qcom_icc_node qhs_venus_cvp_throttle_cfg = { - .name = "qhs_venus_cvp_throttle_cfg", - .id = SA8775P_SLAVE_VENUS_CVP_THROTTLE_CFG, +static struct qcom_icc_node qnm_snoc_sf = { + .name = "qnm_snoc_sf", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 16, + .num_links = 3, + .link_nodes = { &qns_gem_noc_cnoc, &qns_llcc, + &qns_pcie }, }; -static struct qcom_icc_node qhs_venus_v_cpu_throttle_cfg = { - .name = "qhs_venus_v_cpu_throttle_cfg", - .id = SA8775P_SLAVE_VENUS_V_CPU_THROTTLE_CFG, +static struct qcom_icc_node qns_gp_dsp_sail_noc = { + .name = "qns_gp_dsp_sail_noc", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 16, + .num_links = 1, + .link_nodes = { &qnm_gpdsp_sail }, }; -static struct qcom_icc_node qhs_venus_vcodec_throttle_cfg = { - .name = "qhs_venus_vcodec_throttle_cfg", - .id = SA8775P_SLAVE_VENUS_VCODEC_THROTTLE_CFG, +static struct qcom_icc_node qns_mem_noc_sf = { + .name = "qns_mem_noc_sf", + .id = ALLOC_DYN_ID, + .channels = 2, + .buswidth = 32, + .num_links = 1, + .link_nodes = { &qnm_mnoc_sf }, +}; + +static struct qcom_icc_node qns_nsp_gemnoc = { + .name = "qns_nsp_gemnoc", + .id = ALLOC_DYN_ID, + .channels = 2, + .buswidth = 32, + .num_links = 1, + .link_nodes = { &qnm_cmpnoc0 }, +}; + +static struct qcom_icc_node qns_nspb_gemnoc = { + .name = "qns_nspb_gemnoc", + .id = ALLOC_DYN_ID, + .channels = 2, + .buswidth = 32, + .num_links = 1, + .link_nodes = { &qnm_cmpnoc1 }, +}; + +static struct qcom_icc_node qns_pcie_mem_noc = { + .name = "qns_pcie_mem_noc", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 32, + .num_links = 1, + .link_nodes = { &qnm_pcie }, }; -static struct qcom_icc_node qns_ddrss_cfg = { - .name = "qns_ddrss_cfg", - .id = SA8775P_SLAVE_DDRSS_CFG, +static struct qcom_icc_node qns_gemnoc_sf = { + .name = "qns_gemnoc_sf", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 16, .num_links = 1, - .links = { SA8775P_MASTER_CNOC_DC_NOC }, + .link_nodes = { &qnm_snoc_sf }, }; -static struct qcom_icc_node qns_gpdsp_noc_cfg = { - .name = "qns_gpdsp_noc_cfg", - .id = SA8775P_SLAVE_GPDSP_NOC_CFG, +static struct qcom_icc_node qxm_dsp0 = { + .name = "qxm_dsp0", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 16, + .num_links = 1, + .link_nodes = { &qns_gp_dsp_sail_noc }, }; -static struct qcom_icc_node qns_mnoc_hf_cfg = { - .name = "qns_mnoc_hf_cfg", - .id = SA8775P_SLAVE_CNOC_MNOC_HF_CFG, +static struct qcom_icc_node qxm_dsp1 = { + .name = "qxm_dsp1", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 16, .num_links = 1, - .links = { SA8775P_MASTER_CNOC_MNOC_HF_CFG }, + .link_nodes = { &qns_gp_dsp_sail_noc }, }; -static struct qcom_icc_node qns_mnoc_sf_cfg = { - .name = "qns_mnoc_sf_cfg", - .id = SA8775P_SLAVE_CNOC_MNOC_SF_CFG, +static struct qcom_icc_node qnm_camnoc_icp = { + .name = "qnm_camnoc_icp", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 8, .num_links = 1, - .links = { SA8775P_MASTER_CNOC_MNOC_SF_CFG }, + .link_nodes = { &qns_mem_noc_sf }, }; -static struct qcom_icc_node qns_pcie_anoc_cfg = { - .name = "qns_pcie_anoc_cfg", - .id = SA8775P_SLAVE_PCIE_ANOC_CFG, +static struct qcom_icc_node qnm_camnoc_sf = { + .name = "qnm_camnoc_sf", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 32, + .num_links = 1, + .link_nodes = { &qns_mem_noc_sf }, }; -static struct qcom_icc_node qns_snoc_cfg = { - .name = "qns_snoc_cfg", - .id = SA8775P_SLAVE_SNOC_CFG, +static struct qcom_icc_node qnm_video0 = { + .name = "qnm_video0", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 32, .num_links = 1, - .links = { SA8775P_MASTER_SNOC_CFG }, + .link_nodes = { &qns_mem_noc_sf }, }; -static struct qcom_icc_node qxs_boot_imem = { - .name = "qxs_boot_imem", - .id = SA8775P_SLAVE_BOOT_IMEM, +static struct qcom_icc_node qnm_video1 = { + .name = "qnm_video1", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 16, + .buswidth = 32, + .num_links = 1, + .link_nodes = { &qns_mem_noc_sf }, }; -static struct qcom_icc_node qxs_imem = { - .name = "qxs_imem", - .id = SA8775P_SLAVE_IMEM, +static struct qcom_icc_node qnm_video_cvp = { + .name = "qnm_video_cvp", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 8, + .buswidth = 32, + .num_links = 1, + .link_nodes = { &qns_mem_noc_sf }, }; -static struct qcom_icc_node qxs_pimem = { - .name = "qxs_pimem", - .id = SA8775P_SLAVE_PIMEM, +static struct qcom_icc_node qnm_video_v_cpu = { + .name = "qnm_video_v_cpu", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 8, + .num_links = 1, + .link_nodes = { &qns_mem_noc_sf }, }; -static struct qcom_icc_node xs_pcie_0 = { - .name = "xs_pcie_0", - .id = SA8775P_SLAVE_PCIE_0, - .channels = 1, - .buswidth = 16, +static struct qcom_icc_node qxm_nsp = { + .name = "qxm_nsp", + .id = ALLOC_DYN_ID, + .channels = 2, + .buswidth = 32, + .num_links = 2, + .link_nodes = { &qns_hcp, &qns_nsp_gemnoc }, }; -static struct qcom_icc_node xs_pcie_1 = { - .name = "xs_pcie_1", - .id = SA8775P_SLAVE_PCIE_1, - .channels = 1, +static struct qcom_icc_node qxm_nspb = { + .name = "qxm_nspb", + .id = ALLOC_DYN_ID, + .channels = 2, .buswidth = 32, + .num_links = 2, + .link_nodes = { &qns_nspb_hcp, &qns_nspb_gemnoc }, }; -static struct qcom_icc_node xs_qdss_stm = { - .name = "xs_qdss_stm", - .id = SA8775P_SLAVE_QDSS_STM, +static struct qcom_icc_node xm_pcie3_0 = { + .name = "xm_pcie3_0", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 16, + .num_links = 1, + .link_nodes = { &qns_pcie_mem_noc }, }; -static struct qcom_icc_node xs_sys_tcu_cfg = { - .name = "xs_sys_tcu_cfg", - .id = SA8775P_SLAVE_TCU, +static struct qcom_icc_node xm_pcie3_1 = { + .name = "xm_pcie3_1", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 8, + .buswidth = 32, + .num_links = 1, + .link_nodes = { &qns_pcie_mem_noc }, }; -static struct qcom_icc_node qhs_llcc = { - .name = "qhs_llcc", - .id = SA8775P_SLAVE_LLCC_CFG, +static struct qcom_icc_node qhm_gic = { + .name = "qhm_gic", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, + .num_links = 1, + .link_nodes = { &qns_gemnoc_sf }, }; -static struct qcom_icc_node qns_gemnoc = { - .name = "qns_gemnoc", - .id = SA8775P_SLAVE_GEM_NOC_CFG, +static struct qcom_icc_node qnm_aggre1_noc = { + .name = "qnm_aggre1_noc", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 32, .num_links = 1, - .links = { SA8775P_MASTER_GEM_NOC_CFG }, + .link_nodes = { &qns_gemnoc_sf }, }; -static struct qcom_icc_node qns_gem_noc_cnoc = { - .name = "qns_gem_noc_cnoc", - .id = SA8775P_SLAVE_GEM_NOC_CNOC, +static struct qcom_icc_node qnm_aggre2_noc = { + .name = "qnm_aggre2_noc", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 16, .num_links = 1, - .links = { SA8775P_MASTER_GEM_NOC_CNOC }, + .link_nodes = { &qns_gemnoc_sf }, }; -static struct qcom_icc_node qns_llcc = { - .name = "qns_llcc", - .id = SA8775P_SLAVE_LLCC, - .channels = 6, +static struct qcom_icc_node qnm_lpass_noc = { + .name = "qnm_lpass_noc", + .id = ALLOC_DYN_ID, + .channels = 1, .buswidth = 16, .num_links = 1, - .links = { SA8775P_MASTER_LLCC }, + .link_nodes = { &qns_gemnoc_sf }, }; -static struct qcom_icc_node qns_pcie = { - .name = "qns_pcie", - .id = SA8775P_SLAVE_GEM_NOC_PCIE_CNOC, +static struct qcom_icc_node qns_a1noc_snoc = { + .name = "qns_a1noc_snoc", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 16, + .buswidth = 32, .num_links = 1, - .links = { SA8775P_MASTER_GEM_NOC_PCIE_SNOC }, + .link_nodes = { &qnm_aggre1_noc }, }; -static struct qcom_icc_node srvc_even_gemnoc = { - .name = "srvc_even_gemnoc", - .id = SA8775P_SLAVE_SERVICE_GEM_NOC_1, +static struct qcom_icc_node qns_a2noc_snoc = { + .name = "qns_a2noc_snoc", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 16, + .num_links = 1, + .link_nodes = { &qnm_aggre2_noc }, }; -static struct qcom_icc_node srvc_odd_gemnoc = { - .name = "srvc_odd_gemnoc", - .id = SA8775P_SLAVE_SERVICE_GEM_NOC_2, +static struct qcom_icc_node qns_sysnoc = { + .name = "qns_sysnoc", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 16, + .num_links = 1, + .link_nodes = { &qnm_lpass_noc }, }; -static struct qcom_icc_node srvc_sys_gemnoc = { - .name = "srvc_sys_gemnoc", - .id = SA8775P_SLAVE_SERVICE_GEM_NOC, +static struct qcom_icc_node qxm_qup3 = { + .name = "qxm_qup3", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 8, + .num_links = 1, + .link_nodes = { &qns_a1noc_snoc }, }; -static struct qcom_icc_node srvc_sys_gemnoc_2 = { - .name = "srvc_sys_gemnoc_2", - .id = SA8775P_SLAVE_SERVICE_GEM_NOC2, +static struct qcom_icc_node xm_emac_0 = { + .name = "xm_emac_0", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 8, + .num_links = 1, + .link_nodes = { &qns_a1noc_snoc }, }; -static struct qcom_icc_node qns_gp_dsp_sail_noc = { - .name = "qns_gp_dsp_sail_noc", - .id = SA8775P_SLAVE_GP_DSP_SAIL_NOC, +static struct qcom_icc_node xm_emac_1 = { + .name = "xm_emac_1", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 16, + .buswidth = 8, .num_links = 1, - .links = { SA8775P_MASTER_GPDSP_SAIL }, + .link_nodes = { &qns_a1noc_snoc }, }; -static struct qcom_icc_node qhs_lpass_core = { - .name = "qhs_lpass_core", - .id = SA8775P_SLAVE_LPASS_CORE_CFG, +static struct qcom_icc_node xm_sdc1 = { + .name = "xm_sdc1", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 8, + .num_links = 1, + .link_nodes = { &qns_a1noc_snoc }, }; -static struct qcom_icc_node qhs_lpass_lpi = { - .name = "qhs_lpass_lpi", - .id = SA8775P_SLAVE_LPASS_LPI_CFG, +static struct qcom_icc_node xm_ufs_mem = { + .name = "xm_ufs_mem", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 8, + .num_links = 1, + .link_nodes = { &qns_a1noc_snoc }, }; -static struct qcom_icc_node qhs_lpass_mpu = { - .name = "qhs_lpass_mpu", - .id = SA8775P_SLAVE_LPASS_MPU_CFG, +static struct qcom_icc_node xm_usb2_2 = { + .name = "xm_usb2_2", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 8, + .num_links = 1, + .link_nodes = { &qns_a1noc_snoc }, }; -static struct qcom_icc_node qhs_lpass_top = { - .name = "qhs_lpass_top", - .id = SA8775P_SLAVE_LPASS_TOP_CFG, +static struct qcom_icc_node xm_usb3_0 = { + .name = "xm_usb3_0", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 8, + .num_links = 1, + .link_nodes = { &qns_a1noc_snoc }, }; -static struct qcom_icc_node qns_sysnoc = { - .name = "qns_sysnoc", - .id = SA8775P_SLAVE_LPASS_SNOC, +static struct qcom_icc_node xm_usb3_1 = { + .name = "xm_usb3_1", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 16, + .buswidth = 8, .num_links = 1, - .links = { SA8775P_MASTER_LPASS_ANOC }, + .link_nodes = { &qns_a1noc_snoc }, }; -static struct qcom_icc_node srvc_niu_aml_noc = { - .name = "srvc_niu_aml_noc", - .id = SA8775P_SLAVE_SERVICES_LPASS_AML_NOC, +static struct qcom_icc_node qhm_qdss_bam = { + .name = "qhm_qdss_bam", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, + .num_links = 1, + .link_nodes = { &qns_a2noc_snoc }, }; -static struct qcom_icc_node srvc_niu_lpass_agnoc = { - .name = "srvc_niu_lpass_agnoc", - .id = SA8775P_SLAVE_SERVICE_LPASS_AG_NOC, +static struct qcom_icc_node qhm_qup0 = { + .name = "qhm_qup0", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, -}; - -static struct qcom_icc_node ebi = { - .name = "ebi", - .id = SA8775P_SLAVE_EBI1, - .channels = 8, - .buswidth = 4, -}; - -static struct qcom_icc_node qns_mem_noc_hf = { - .name = "qns_mem_noc_hf", - .id = SA8775P_SLAVE_MNOC_HF_MEM_NOC, - .channels = 2, - .buswidth = 32, - .num_links = 1, - .links = { SA8775P_MASTER_MNOC_HF_MEM_NOC }, -}; - -static struct qcom_icc_node qns_mem_noc_sf = { - .name = "qns_mem_noc_sf", - .id = SA8775P_SLAVE_MNOC_SF_MEM_NOC, - .channels = 2, - .buswidth = 32, .num_links = 1, - .links = { SA8775P_MASTER_MNOC_SF_MEM_NOC }, + .link_nodes = { &qns_a2noc_snoc }, }; -static struct qcom_icc_node srvc_mnoc_hf = { - .name = "srvc_mnoc_hf", - .id = SA8775P_SLAVE_SERVICE_MNOC_HF, +static struct qcom_icc_node qhm_qup1 = { + .name = "qhm_qup1", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, + .num_links = 1, + .link_nodes = { &qns_a2noc_snoc }, }; -static struct qcom_icc_node srvc_mnoc_sf = { - .name = "srvc_mnoc_sf", - .id = SA8775P_SLAVE_SERVICE_MNOC_SF, +static struct qcom_icc_node qhm_qup2 = { + .name = "qhm_qup2", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, -}; - -static struct qcom_icc_node qns_hcp = { - .name = "qns_hcp", - .id = SA8775P_SLAVE_HCP_A, - .channels = 2, - .buswidth = 32, -}; - -static struct qcom_icc_node qns_nsp_gemnoc = { - .name = "qns_nsp_gemnoc", - .id = SA8775P_SLAVE_CDSP_MEM_NOC, - .channels = 2, - .buswidth = 32, .num_links = 1, - .links = { SA8775P_MASTER_COMPUTE_NOC }, + .link_nodes = { &qns_a2noc_snoc }, }; -static struct qcom_icc_node service_nsp_noc = { - .name = "service_nsp_noc", - .id = SA8775P_SLAVE_SERVICE_NSP_NOC, +static struct qcom_icc_node qnm_cnoc_datapath = { + .name = "qnm_cnoc_datapath", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 8, + .num_links = 1, + .link_nodes = { &qns_a2noc_snoc }, }; -static struct qcom_icc_node qns_nspb_gemnoc = { - .name = "qns_nspb_gemnoc", - .id = SA8775P_SLAVE_CDSPB_MEM_NOC, - .channels = 2, - .buswidth = 32, +static struct qcom_icc_node qxm_crypto_0 = { + .name = "qxm_crypto_0", + .id = ALLOC_DYN_ID, + .channels = 1, + .buswidth = 8, .num_links = 1, - .links = { SA8775P_MASTER_COMPUTE_NOC_1 }, + .link_nodes = { &qns_a2noc_snoc }, }; -static struct qcom_icc_node qns_nspb_hcp = { - .name = "qns_nspb_hcp", - .id = SA8775P_SLAVE_HCP_B, - .channels = 2, - .buswidth = 32, +static struct qcom_icc_node qxm_crypto_1 = { + .name = "qxm_crypto_1", + .id = ALLOC_DYN_ID, + .channels = 1, + .buswidth = 8, + .num_links = 1, + .link_nodes = { &qns_a2noc_snoc }, }; -static struct qcom_icc_node service_nspb_noc = { - .name = "service_nspb_noc", - .id = SA8775P_SLAVE_SERVICE_NSPB_NOC, +static struct qcom_icc_node qxm_ipa = { + .name = "qxm_ipa", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 8, + .num_links = 1, + .link_nodes = { &qns_a2noc_snoc }, }; -static struct qcom_icc_node qns_pcie_mem_noc = { - .name = "qns_pcie_mem_noc", - .id = SA8775P_SLAVE_ANOC_PCIE_GEM_NOC, +static struct qcom_icc_node xm_qdss_etr_0 = { + .name = "xm_qdss_etr_0", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 32, + .buswidth = 8, .num_links = 1, - .links = { SA8775P_MASTER_ANOC_PCIE_GEM_NOC }, + .link_nodes = { &qns_a2noc_snoc }, }; -static struct qcom_icc_node qns_gemnoc_gc = { - .name = "qns_gemnoc_gc", - .id = SA8775P_SLAVE_SNOC_GEM_NOC_GC, +static struct qcom_icc_node xm_qdss_etr_1 = { + .name = "xm_qdss_etr_1", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 8, .num_links = 1, - .links = { SA8775P_MASTER_SNOC_GC_MEM_NOC }, + .link_nodes = { &qns_a2noc_snoc }, }; -static struct qcom_icc_node qns_gemnoc_sf = { - .name = "qns_gemnoc_sf", - .id = SA8775P_SLAVE_SNOC_GEM_NOC_SF, +static struct qcom_icc_node xm_ufs_card = { + .name = "xm_ufs_card", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 16, + .buswidth = 8, .num_links = 1, - .links = { SA8775P_MASTER_SNOC_SF_MEM_NOC }, + .link_nodes = { &qns_a2noc_snoc }, }; -static struct qcom_icc_node srvc_snoc = { - .name = "srvc_snoc", - .id = SA8775P_SLAVE_SERVICE_SNOC, +static struct qcom_icc_node qxm_lpass_dsp = { + .name = "qxm_lpass_dsp", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 8, + .num_links = 4, + .link_nodes = { &qhs_lpass_top, &qns_sysnoc, + &srvc_niu_aml_noc, &srvc_niu_lpass_agnoc }, }; static struct qcom_icc_bcm bcm_acv = { -- 2.39.2