interconnect: qcom: introduce RPMh Network-On-Chip Interconnect on SM8650 SoC
authorNeil Armstrong <neil.armstrong@linaro.org>
Thu, 23 Nov 2023 13:32:13 +0000 (14:32 +0100)
committerGeorgi Djakov <djakov@kernel.org>
Thu, 23 Nov 2023 22:15:06 +0000 (00:15 +0200)
Add RPMh Network-On-Chip Interconnect support for the SM8650 platform.

Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
Link: https://lore.kernel.org/r/20231123-topic-sm8650-upstream-interconnect-v2-2-7e050874f59b@linaro.org
Signed-off-by: Georgi Djakov <djakov@kernel.org>
drivers/interconnect/qcom/Kconfig
drivers/interconnect/qcom/Makefile
drivers/interconnect/qcom/sm8650.c [new file with mode: 0644]
drivers/interconnect/qcom/sm8650.h [new file with mode: 0644]

index 62b516d38d03ff23da192c33b4a289379fdfc4cc..4c12222e0e8f0a96fe75529953dd086210c7f449 100644 (file)
@@ -245,5 +245,14 @@ config INTERCONNECT_QCOM_SM8550
          This is a driver for the Qualcomm Network-on-Chip on SM8550-based
          platforms.
 
+config INTERCONNECT_QCOM_SM8650
+       tristate "Qualcomm SM8650 interconnect driver"
+       depends on INTERCONNECT_QCOM_RPMH_POSSIBLE
+       select INTERCONNECT_QCOM_RPMH
+       select INTERCONNECT_QCOM_BCM_VOTER
+       help
+         This is a driver for the Qualcomm Network-on-Chip on SM8650-based
+         platforms.
+
 config INTERCONNECT_QCOM_SMD_RPM
        tristate
index c5320e293960a38acf636fcc1d350d13115ce628..41e5c5000a3c80a78cca2f373e1f592475cf0b86 100644 (file)
@@ -30,6 +30,7 @@ qnoc-sm8250-objs                      := sm8250.o
 qnoc-sm8350-objs                       := sm8350.o
 qnoc-sm8450-objs                       := sm8450.o
 qnoc-sm8550-objs                       := sm8550.o
+qnoc-sm8650-objs                       := sm8650.o
 icc-smd-rpm-objs                       := smd-rpm.o icc-rpm.o icc-rpm-clocks.o
 
 obj-$(CONFIG_INTERCONNECT_QCOM_BCM_VOTER) += icc-bcm-voter.o
@@ -59,4 +60,5 @@ obj-$(CONFIG_INTERCONNECT_QCOM_SM8250) += qnoc-sm8250.o
 obj-$(CONFIG_INTERCONNECT_QCOM_SM8350) += qnoc-sm8350.o
 obj-$(CONFIG_INTERCONNECT_QCOM_SM8450) += qnoc-sm8450.o
 obj-$(CONFIG_INTERCONNECT_QCOM_SM8550) += qnoc-sm8550.o
+obj-$(CONFIG_INTERCONNECT_QCOM_SM8650) += qnoc-sm8650.o
 obj-$(CONFIG_INTERCONNECT_QCOM_SMD_RPM) += icc-smd-rpm.o
diff --git a/drivers/interconnect/qcom/sm8650.c b/drivers/interconnect/qcom/sm8650.c
new file mode 100644 (file)
index 0000000..b83de54
--- /dev/null
@@ -0,0 +1,1674 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright (c) 2021, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2022, Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2023, Linaro Limited
+ */
+
+#include <linux/device.h>
+#include <linux/interconnect.h>
+#include <linux/interconnect-provider.h>
+#include <linux/module.h>
+#include <linux/of_platform.h>
+#include <dt-bindings/interconnect/qcom,sm8650-rpmh.h>
+
+#include "bcm-voter.h"
+#include "icc-common.h"
+#include "icc-rpmh.h"
+#include "sm8650.h"
+
+static struct qcom_icc_node qhm_qspi = {
+       .name = "qhm_qspi",
+       .id = SM8650_MASTER_QSPI_0,
+       .channels = 1,
+       .buswidth = 4,
+       .num_links = 1,
+       .links = { SM8650_SLAVE_A1NOC_SNOC },
+};
+
+static struct qcom_icc_node qhm_qup1 = {
+       .name = "qhm_qup1",
+       .id = SM8650_MASTER_QUP_1,
+       .channels = 1,
+       .buswidth = 4,
+       .num_links = 1,
+       .links = { SM8650_SLAVE_A1NOC_SNOC },
+};
+
+static struct qcom_icc_node qxm_qup02 = {
+       .name = "qxm_qup02",
+       .id = SM8650_MASTER_QUP_3,
+       .channels = 1,
+       .buswidth = 8,
+       .num_links = 1,
+       .links = { SM8650_SLAVE_A1NOC_SNOC },
+};
+
+static struct qcom_icc_node xm_sdc4 = {
+       .name = "xm_sdc4",
+       .id = SM8650_MASTER_SDCC_4,
+       .channels = 1,
+       .buswidth = 8,
+       .num_links = 1,
+       .links = { SM8650_SLAVE_A1NOC_SNOC },
+};
+
+static struct qcom_icc_node xm_ufs_mem = {
+       .name = "xm_ufs_mem",
+       .id = SM8650_MASTER_UFS_MEM,
+       .channels = 1,
+       .buswidth = 16,
+       .num_links = 1,
+       .links = { SM8650_SLAVE_A1NOC_SNOC },
+};
+
+static struct qcom_icc_node xm_usb3_0 = {
+       .name = "xm_usb3_0",
+       .id = SM8650_MASTER_USB3_0,
+       .channels = 1,
+       .buswidth = 8,
+       .num_links = 1,
+       .links = { SM8650_SLAVE_A1NOC_SNOC },
+};
+
+static struct qcom_icc_node qhm_qdss_bam = {
+       .name = "qhm_qdss_bam",
+       .id = SM8650_MASTER_QDSS_BAM,
+       .channels = 1,
+       .buswidth = 4,
+       .num_links = 1,
+       .links = { SM8650_SLAVE_A2NOC_SNOC },
+};
+
+static struct qcom_icc_node qhm_qup2 = {
+       .name = "qhm_qup2",
+       .id = SM8650_MASTER_QUP_2,
+       .channels = 1,
+       .buswidth = 4,
+       .num_links = 1,
+       .links = { SM8650_SLAVE_A2NOC_SNOC },
+};
+
+static struct qcom_icc_node qxm_crypto = {
+       .name = "qxm_crypto",
+       .id = SM8650_MASTER_CRYPTO,
+       .channels = 1,
+       .buswidth = 8,
+       .num_links = 1,
+       .links = { SM8650_SLAVE_A2NOC_SNOC },
+};
+
+static struct qcom_icc_node qxm_ipa = {
+       .name = "qxm_ipa",
+       .id = SM8650_MASTER_IPA,
+       .channels = 1,
+       .buswidth = 8,
+       .num_links = 1,
+       .links = { SM8650_SLAVE_A2NOC_SNOC },
+};
+
+static struct qcom_icc_node qxm_sp = {
+       .name = "qxm_sp",
+       .id = SM8650_MASTER_SP,
+       .channels = 1,
+       .buswidth = 8,
+       .num_links = 1,
+       .links = { SM8650_SLAVE_A2NOC_SNOC },
+};
+
+static struct qcom_icc_node xm_qdss_etr_0 = {
+       .name = "xm_qdss_etr_0",
+       .id = SM8650_MASTER_QDSS_ETR,
+       .channels = 1,
+       .buswidth = 8,
+       .num_links = 1,
+       .links = { SM8650_SLAVE_A2NOC_SNOC },
+};
+
+static struct qcom_icc_node xm_qdss_etr_1 = {
+       .name = "xm_qdss_etr_1",
+       .id = SM8650_MASTER_QDSS_ETR_1,
+       .channels = 1,
+       .buswidth = 8,
+       .num_links = 1,
+       .links = { SM8650_SLAVE_A2NOC_SNOC },
+};
+
+static struct qcom_icc_node xm_sdc2 = {
+       .name = "xm_sdc2",
+       .id = SM8650_MASTER_SDCC_2,
+       .channels = 1,
+       .buswidth = 8,
+       .num_links = 1,
+       .links = { SM8650_SLAVE_A2NOC_SNOC },
+};
+
+static struct qcom_icc_node qup0_core_master = {
+       .name = "qup0_core_master",
+       .id = SM8650_MASTER_QUP_CORE_0,
+       .channels = 1,
+       .buswidth = 4,
+       .num_links = 1,
+       .links = { SM8650_SLAVE_QUP_CORE_0 },
+};
+
+static struct qcom_icc_node qup1_core_master = {
+       .name = "qup1_core_master",
+       .id = SM8650_MASTER_QUP_CORE_1,
+       .channels = 1,
+       .buswidth = 4,
+       .num_links = 1,
+       .links = { SM8650_SLAVE_QUP_CORE_1 },
+};
+
+static struct qcom_icc_node qup2_core_master = {
+       .name = "qup2_core_master",
+       .id = SM8650_MASTER_QUP_CORE_2,
+       .channels = 1,
+       .buswidth = 4,
+       .num_links = 1,
+       .links = { SM8650_SLAVE_QUP_CORE_2 },
+};
+
+static struct qcom_icc_node qsm_cfg = {
+       .name = "qsm_cfg",
+       .id = SM8650_MASTER_CNOC_CFG,
+       .channels = 1,
+       .buswidth = 4,
+       .num_links = 46,
+       .links = { SM8650_SLAVE_AHB2PHY_SOUTH, SM8650_SLAVE_AHB2PHY_NORTH,
+                  SM8650_SLAVE_CAMERA_CFG, SM8650_SLAVE_CLK_CTL,
+                  SM8650_SLAVE_RBCPR_CX_CFG, SM8650_SLAVE_CPR_HMX,
+                  SM8650_SLAVE_RBCPR_MMCX_CFG, SM8650_SLAVE_RBCPR_MXA_CFG,
+                  SM8650_SLAVE_RBCPR_MXC_CFG, SM8650_SLAVE_CPR_NSPCX,
+                  SM8650_SLAVE_CRYPTO_0_CFG, SM8650_SLAVE_CX_RDPM,
+                  SM8650_SLAVE_DISPLAY_CFG, SM8650_SLAVE_GFX3D_CFG,
+                  SM8650_SLAVE_I2C, SM8650_SLAVE_I3C_IBI0_CFG,
+                  SM8650_SLAVE_I3C_IBI1_CFG, SM8650_SLAVE_IMEM_CFG,
+                  SM8650_SLAVE_CNOC_MSS, SM8650_SLAVE_MX_2_RDPM,
+                  SM8650_SLAVE_MX_RDPM, SM8650_SLAVE_PCIE_0_CFG,
+                  SM8650_SLAVE_PCIE_1_CFG, SM8650_SLAVE_PCIE_RSCC,
+                  SM8650_SLAVE_PDM, SM8650_SLAVE_PRNG,
+                  SM8650_SLAVE_QDSS_CFG, SM8650_SLAVE_QSPI_0,
+                  SM8650_SLAVE_QUP_3, SM8650_SLAVE_QUP_1,
+                  SM8650_SLAVE_QUP_2, SM8650_SLAVE_SDCC_2,
+                  SM8650_SLAVE_SDCC_4, SM8650_SLAVE_SPSS_CFG,
+                  SM8650_SLAVE_TCSR, SM8650_SLAVE_TLMM,
+                  SM8650_SLAVE_UFS_MEM_CFG, SM8650_SLAVE_USB3_0,
+                  SM8650_SLAVE_VENUS_CFG, SM8650_SLAVE_VSENSE_CTRL_CFG,
+                  SM8650_SLAVE_CNOC_MNOC_CFG, SM8650_SLAVE_NSP_QTB_CFG,
+                  SM8650_SLAVE_PCIE_ANOC_CFG, SM8650_SLAVE_SERVICE_CNOC_CFG,
+                  SM8650_SLAVE_QDSS_STM, SM8650_SLAVE_TCU },
+};
+
+static struct qcom_icc_node qnm_gemnoc_cnoc = {
+       .name = "qnm_gemnoc_cnoc",
+       .id = SM8650_MASTER_GEM_NOC_CNOC,
+       .channels = 1,
+       .buswidth = 16,
+       .num_links = 9,
+       .links = { SM8650_SLAVE_AOSS, SM8650_SLAVE_IPA_CFG,
+                  SM8650_SLAVE_IPC_ROUTER_CFG, SM8650_SLAVE_TME_CFG,
+                  SM8650_SLAVE_APPSS, SM8650_SLAVE_CNOC_CFG,
+                  SM8650_SLAVE_DDRSS_CFG, SM8650_SLAVE_IMEM,
+                  SM8650_SLAVE_SERVICE_CNOC },
+};
+
+static struct qcom_icc_node qnm_gemnoc_pcie = {
+       .name = "qnm_gemnoc_pcie",
+       .id = SM8650_MASTER_GEM_NOC_PCIE_SNOC,
+       .channels = 1,
+       .buswidth = 16,
+       .num_links = 2,
+       .links = { SM8650_SLAVE_PCIE_0, SM8650_SLAVE_PCIE_1 },
+};
+
+static struct qcom_icc_node alm_gpu_tcu = {
+       .name = "alm_gpu_tcu",
+       .id = SM8650_MASTER_GPU_TCU,
+       .channels = 1,
+       .buswidth = 8,
+       .num_links = 2,
+       .links = { SM8650_SLAVE_GEM_NOC_CNOC, SM8650_SLAVE_LLCC },
+};
+
+static struct qcom_icc_node alm_sys_tcu = {
+       .name = "alm_sys_tcu",
+       .id = SM8650_MASTER_SYS_TCU,
+       .channels = 1,
+       .buswidth = 8,
+       .num_links = 2,
+       .links = { SM8650_SLAVE_GEM_NOC_CNOC, SM8650_SLAVE_LLCC },
+};
+
+static struct qcom_icc_node alm_ubwc_p_tcu = {
+       .name = "alm_ubwc_p_tcu",
+       .id = SM8650_MASTER_UBWC_P_TCU,
+       .channels = 1,
+       .buswidth = 8,
+       .num_links = 2,
+       .links = { SM8650_SLAVE_GEM_NOC_CNOC, SM8650_SLAVE_LLCC },
+};
+
+static struct qcom_icc_node chm_apps = {
+       .name = "chm_apps",
+       .id = SM8650_MASTER_APPSS_PROC,
+       .channels = 3,
+       .buswidth = 32,
+       .num_links = 3,
+       .links = { SM8650_SLAVE_GEM_NOC_CNOC, SM8650_SLAVE_LLCC,
+                  SM8650_SLAVE_MEM_NOC_PCIE_SNOC },
+};
+
+static struct qcom_icc_node qnm_gpu = {
+       .name = "qnm_gpu",
+       .id = SM8650_MASTER_GFX3D,
+       .channels = 2,
+       .buswidth = 32,
+       .num_links = 2,
+       .links = { SM8650_SLAVE_GEM_NOC_CNOC, SM8650_SLAVE_LLCC },
+};
+
+static struct qcom_icc_node qnm_lpass_gemnoc = {
+       .name = "qnm_lpass_gemnoc",
+       .id = SM8650_MASTER_LPASS_GEM_NOC,
+       .channels = 1,
+       .buswidth = 16,
+       .num_links = 3,
+       .links = { SM8650_SLAVE_GEM_NOC_CNOC, SM8650_SLAVE_LLCC,
+                  SM8650_SLAVE_MEM_NOC_PCIE_SNOC },
+};
+
+static struct qcom_icc_node qnm_mdsp = {
+       .name = "qnm_mdsp",
+       .id = SM8650_MASTER_MSS_PROC,
+       .channels = 1,
+       .buswidth = 16,
+       .num_links = 3,
+       .links = { SM8650_SLAVE_GEM_NOC_CNOC, SM8650_SLAVE_LLCC,
+                  SM8650_SLAVE_MEM_NOC_PCIE_SNOC },
+};
+
+static struct qcom_icc_node qnm_mnoc_hf = {
+       .name = "qnm_mnoc_hf",
+       .id = SM8650_MASTER_MNOC_HF_MEM_NOC,
+       .channels = 2,
+       .buswidth = 32,
+       .num_links = 2,
+       .links = { SM8650_SLAVE_GEM_NOC_CNOC, SM8650_SLAVE_LLCC },
+};
+
+static struct qcom_icc_node qnm_mnoc_sf = {
+       .name = "qnm_mnoc_sf",
+       .id = SM8650_MASTER_MNOC_SF_MEM_NOC,
+       .channels = 2,
+       .buswidth = 32,
+       .num_links = 2,
+       .links = { SM8650_SLAVE_GEM_NOC_CNOC, SM8650_SLAVE_LLCC },
+};
+
+static struct qcom_icc_node qnm_nsp_gemnoc = {
+       .name = "qnm_nsp_gemnoc",
+       .id = SM8650_MASTER_COMPUTE_NOC,
+       .channels = 2,
+       .buswidth = 32,
+       .num_links = 3,
+       .links = { SM8650_SLAVE_GEM_NOC_CNOC, SM8650_SLAVE_LLCC,
+                  SM8650_SLAVE_MEM_NOC_PCIE_SNOC },
+};
+
+static struct qcom_icc_node qnm_pcie = {
+       .name = "qnm_pcie",
+       .id = SM8650_MASTER_ANOC_PCIE_GEM_NOC,
+       .channels = 1,
+       .buswidth = 16,
+       .num_links = 2,
+       .links = { SM8650_SLAVE_GEM_NOC_CNOC, SM8650_SLAVE_LLCC },
+};
+
+static struct qcom_icc_node qnm_snoc_sf = {
+       .name = "qnm_snoc_sf",
+       .id = SM8650_MASTER_SNOC_SF_MEM_NOC,
+       .channels = 1,
+       .buswidth = 16,
+       .num_links = 3,
+       .links = { SM8650_SLAVE_GEM_NOC_CNOC, SM8650_SLAVE_LLCC,
+                  SM8650_SLAVE_MEM_NOC_PCIE_SNOC },
+};
+
+static struct qcom_icc_node qnm_ubwc_p = {
+       .name = "qnm_ubwc_p",
+       .id = SM8650_MASTER_UBWC_P,
+       .channels = 1,
+       .buswidth = 32,
+       .num_links = 1,
+       .links = { SM8650_SLAVE_LLCC },
+};
+
+static struct qcom_icc_node xm_gic = {
+       .name = "xm_gic",
+       .id = SM8650_MASTER_GIC,
+       .channels = 1,
+       .buswidth = 8,
+       .num_links = 1,
+       .links = { SM8650_SLAVE_LLCC },
+};
+
+static struct qcom_icc_node qnm_lpiaon_noc = {
+       .name = "qnm_lpiaon_noc",
+       .id = SM8650_MASTER_LPIAON_NOC,
+       .channels = 1,
+       .buswidth = 16,
+       .num_links = 1,
+       .links = { SM8650_SLAVE_LPASS_GEM_NOC },
+};
+
+static struct qcom_icc_node qnm_lpass_lpinoc = {
+       .name = "qnm_lpass_lpinoc",
+       .id = SM8650_MASTER_LPASS_LPINOC,
+       .channels = 1,
+       .buswidth = 16,
+       .num_links = 1,
+       .links = { SM8650_SLAVE_LPIAON_NOC_LPASS_AG_NOC },
+};
+
+static struct qcom_icc_node qxm_lpinoc_dsp_axim = {
+       .name = "qxm_lpinoc_dsp_axim",
+       .id = SM8650_MASTER_LPASS_PROC,
+       .channels = 1,
+       .buswidth = 16,
+       .num_links = 1,
+       .links = { SM8650_SLAVE_LPICX_NOC_LPIAON_NOC },
+};
+
+static struct qcom_icc_node llcc_mc = {
+       .name = "llcc_mc",
+       .id = SM8650_MASTER_LLCC,
+       .channels = 4,
+       .buswidth = 4,
+       .num_links = 1,
+       .links = { SM8650_SLAVE_EBI1 },
+};
+
+static struct qcom_icc_node qnm_camnoc_hf = {
+       .name = "qnm_camnoc_hf",
+       .id = SM8650_MASTER_CAMNOC_HF,
+       .channels = 2,
+       .buswidth = 32,
+       .num_links = 1,
+       .links = { SM8650_SLAVE_MNOC_HF_MEM_NOC },
+};
+
+static struct qcom_icc_node qnm_camnoc_icp = {
+       .name = "qnm_camnoc_icp",
+       .id = SM8650_MASTER_CAMNOC_ICP,
+       .channels = 1,
+       .buswidth = 8,
+       .num_links = 1,
+       .links = { SM8650_SLAVE_MNOC_SF_MEM_NOC },
+};
+
+static struct qcom_icc_node qnm_camnoc_sf = {
+       .name = "qnm_camnoc_sf",
+       .id = SM8650_MASTER_CAMNOC_SF,
+       .channels = 2,
+       .buswidth = 32,
+       .num_links = 1,
+       .links = { SM8650_SLAVE_MNOC_SF_MEM_NOC },
+};
+
+static struct qcom_icc_node qnm_mdp = {
+       .name = "qnm_mdp",
+       .id = SM8650_MASTER_MDP,
+       .channels = 2,
+       .buswidth = 32,
+       .num_links = 1,
+       .links = { SM8650_SLAVE_MNOC_HF_MEM_NOC },
+};
+
+static struct qcom_icc_node qnm_vapss_hcp = {
+       .name = "qnm_vapss_hcp",
+       .id = SM8650_MASTER_CDSP_HCP,
+       .channels = 1,
+       .buswidth = 32,
+       .num_links = 1,
+       .links = { SM8650_SLAVE_MNOC_SF_MEM_NOC },
+};
+
+static struct qcom_icc_node qnm_video = {
+       .name = "qnm_video",
+       .id = SM8650_MASTER_VIDEO,
+       .channels = 2,
+       .buswidth = 32,
+       .num_links = 1,
+       .links = { SM8650_SLAVE_MNOC_SF_MEM_NOC },
+};
+
+static struct qcom_icc_node qnm_video_cv_cpu = {
+       .name = "qnm_video_cv_cpu",
+       .id = SM8650_MASTER_VIDEO_CV_PROC,
+       .channels = 1,
+       .buswidth = 8,
+       .num_links = 1,
+       .links = { SM8650_SLAVE_MNOC_SF_MEM_NOC },
+};
+
+static struct qcom_icc_node qnm_video_cvp = {
+       .name = "qnm_video_cvp",
+       .id = SM8650_MASTER_VIDEO_PROC,
+       .channels = 2,
+       .buswidth = 32,
+       .num_links = 1,
+       .links = { SM8650_SLAVE_MNOC_SF_MEM_NOC },
+};
+
+static struct qcom_icc_node qnm_video_v_cpu = {
+       .name = "qnm_video_v_cpu",
+       .id = SM8650_MASTER_VIDEO_V_PROC,
+       .channels = 1,
+       .buswidth = 8,
+       .num_links = 1,
+       .links = { SM8650_SLAVE_MNOC_SF_MEM_NOC },
+};
+
+static struct qcom_icc_node qsm_mnoc_cfg = {
+       .name = "qsm_mnoc_cfg",
+       .id = SM8650_MASTER_CNOC_MNOC_CFG,
+       .channels = 1,
+       .buswidth = 4,
+       .num_links = 1,
+       .links = { SM8650_SLAVE_SERVICE_MNOC },
+};
+
+static struct qcom_icc_node qnm_nsp = {
+       .name = "qnm_nsp",
+       .id = SM8650_MASTER_CDSP_PROC,
+       .channels = 2,
+       .buswidth = 32,
+       .num_links = 1,
+       .links = { SM8650_SLAVE_CDSP_MEM_NOC },
+};
+
+static struct qcom_icc_node qsm_pcie_anoc_cfg = {
+       .name = "qsm_pcie_anoc_cfg",
+       .id = SM8650_MASTER_PCIE_ANOC_CFG,
+       .channels = 1,
+       .buswidth = 4,
+       .num_links = 1,
+       .links = { SM8650_SLAVE_SERVICE_PCIE_ANOC },
+};
+
+static struct qcom_icc_node xm_pcie3_0 = {
+       .name = "xm_pcie3_0",
+       .id = SM8650_MASTER_PCIE_0,
+       .channels = 1,
+       .buswidth = 8,
+       .num_links = 1,
+       .links = { SM8650_SLAVE_ANOC_PCIE_GEM_NOC },
+};
+
+static struct qcom_icc_node xm_pcie3_1 = {
+       .name = "xm_pcie3_1",
+       .id = SM8650_MASTER_PCIE_1,
+       .channels = 1,
+       .buswidth = 16,
+       .num_links = 1,
+       .links = { SM8650_SLAVE_ANOC_PCIE_GEM_NOC },
+};
+
+static struct qcom_icc_node qnm_aggre1_noc = {
+       .name = "qnm_aggre1_noc",
+       .id = SM8650_MASTER_A1NOC_SNOC,
+       .channels = 1,
+       .buswidth = 16,
+       .num_links = 1,
+       .links = { SM8650_SLAVE_SNOC_GEM_NOC_SF },
+};
+
+static struct qcom_icc_node qnm_aggre2_noc = {
+       .name = "qnm_aggre2_noc",
+       .id = SM8650_MASTER_A2NOC_SNOC,
+       .channels = 1,
+       .buswidth = 16,
+       .num_links = 1,
+       .links = { SM8650_SLAVE_SNOC_GEM_NOC_SF },
+};
+
+static struct qcom_icc_node qns_a1noc_snoc = {
+       .name = "qns_a1noc_snoc",
+       .id = SM8650_SLAVE_A1NOC_SNOC,
+       .channels = 1,
+       .buswidth = 16,
+       .num_links = 1,
+       .links = { SM8650_MASTER_A1NOC_SNOC },
+};
+
+static struct qcom_icc_node qns_a2noc_snoc = {
+       .name = "qns_a2noc_snoc",
+       .id = SM8650_SLAVE_A2NOC_SNOC,
+       .channels = 1,
+       .buswidth = 16,
+       .num_links = 1,
+       .links = { SM8650_MASTER_A2NOC_SNOC },
+};
+
+static struct qcom_icc_node qup0_core_slave = {
+       .name = "qup0_core_slave",
+       .id = SM8650_SLAVE_QUP_CORE_0,
+       .channels = 1,
+       .buswidth = 4,
+       .num_links = 0,
+};
+
+static struct qcom_icc_node qup1_core_slave = {
+       .name = "qup1_core_slave",
+       .id = SM8650_SLAVE_QUP_CORE_1,
+       .channels = 1,
+       .buswidth = 4,
+       .num_links = 0,
+};
+
+static struct qcom_icc_node qup2_core_slave = {
+       .name = "qup2_core_slave",
+       .id = SM8650_SLAVE_QUP_CORE_2,
+       .channels = 1,
+       .buswidth = 4,
+       .num_links = 0,
+};
+
+static struct qcom_icc_node qhs_ahb2phy0 = {
+       .name = "qhs_ahb2phy0",
+       .id = SM8650_SLAVE_AHB2PHY_SOUTH,
+       .channels = 1,
+       .buswidth = 4,
+       .num_links = 0,
+};
+
+static struct qcom_icc_node qhs_ahb2phy1 = {
+       .name = "qhs_ahb2phy1",
+       .id = SM8650_SLAVE_AHB2PHY_NORTH,
+       .channels = 1,
+       .buswidth = 4,
+       .num_links = 0,
+};
+
+static struct qcom_icc_node qhs_camera_cfg = {
+       .name = "qhs_camera_cfg",
+       .id = SM8650_SLAVE_CAMERA_CFG,
+       .channels = 1,
+       .buswidth = 4,
+       .num_links = 0,
+};
+
+static struct qcom_icc_node qhs_clk_ctl = {
+       .name = "qhs_clk_ctl",
+       .id = SM8650_SLAVE_CLK_CTL,
+       .channels = 1,
+       .buswidth = 4,
+       .num_links = 0,
+};
+
+static struct qcom_icc_node qhs_cpr_cx = {
+       .name = "qhs_cpr_cx",
+       .id = SM8650_SLAVE_RBCPR_CX_CFG,
+       .channels = 1,
+       .buswidth = 4,
+       .num_links = 0,
+};
+
+static struct qcom_icc_node qhs_cpr_hmx = {
+       .name = "qhs_cpr_hmx",
+       .id = SM8650_SLAVE_CPR_HMX,
+       .channels = 1,
+       .buswidth = 4,
+       .num_links = 0,
+};
+
+static struct qcom_icc_node qhs_cpr_mmcx = {
+       .name = "qhs_cpr_mmcx",
+       .id = SM8650_SLAVE_RBCPR_MMCX_CFG,
+       .channels = 1,
+       .buswidth = 4,
+       .num_links = 0,
+};
+
+static struct qcom_icc_node qhs_cpr_mxa = {
+       .name = "qhs_cpr_mxa",
+       .id = SM8650_SLAVE_RBCPR_MXA_CFG,
+       .channels = 1,
+       .buswidth = 4,
+       .num_links = 0,
+};
+
+static struct qcom_icc_node qhs_cpr_mxc = {
+       .name = "qhs_cpr_mxc",
+       .id = SM8650_SLAVE_RBCPR_MXC_CFG,
+       .channels = 1,
+       .buswidth = 4,
+       .num_links = 0,
+};
+
+static struct qcom_icc_node qhs_cpr_nspcx = {
+       .name = "qhs_cpr_nspcx",
+       .id = SM8650_SLAVE_CPR_NSPCX,
+       .channels = 1,
+       .buswidth = 4,
+       .num_links = 0,
+};
+
+static struct qcom_icc_node qhs_crypto0_cfg = {
+       .name = "qhs_crypto0_cfg",
+       .id = SM8650_SLAVE_CRYPTO_0_CFG,
+       .channels = 1,
+       .buswidth = 4,
+       .num_links = 0,
+};
+
+static struct qcom_icc_node qhs_cx_rdpm = {
+       .name = "qhs_cx_rdpm",
+       .id = SM8650_SLAVE_CX_RDPM,
+       .channels = 1,
+       .buswidth = 4,
+       .num_links = 0,
+};
+
+static struct qcom_icc_node qhs_display_cfg = {
+       .name = "qhs_display_cfg",
+       .id = SM8650_SLAVE_DISPLAY_CFG,
+       .channels = 1,
+       .buswidth = 4,
+       .num_links = 0,
+};
+
+static struct qcom_icc_node qhs_gpuss_cfg = {
+       .name = "qhs_gpuss_cfg",
+       .id = SM8650_SLAVE_GFX3D_CFG,
+       .channels = 1,
+       .buswidth = 8,
+       .num_links = 0,
+};
+
+static struct qcom_icc_node qhs_i2c = {
+       .name = "qhs_i2c",
+       .id = SM8650_SLAVE_I2C,
+       .channels = 1,
+       .buswidth = 4,
+       .num_links = 0,
+};
+
+static struct qcom_icc_node qhs_i3c_ibi0_cfg = {
+       .name = "qhs_i3c_ibi0_cfg",
+       .id = SM8650_SLAVE_I3C_IBI0_CFG,
+       .channels = 1,
+       .buswidth = 4,
+       .num_links = 0,
+};
+
+static struct qcom_icc_node qhs_i3c_ibi1_cfg = {
+       .name = "qhs_i3c_ibi1_cfg",
+       .id = SM8650_SLAVE_I3C_IBI1_CFG,
+       .channels = 1,
+       .buswidth = 4,
+       .num_links = 0,
+};
+
+static struct qcom_icc_node qhs_imem_cfg = {
+       .name = "qhs_imem_cfg",
+       .id = SM8650_SLAVE_IMEM_CFG,
+       .channels = 1,
+       .buswidth = 4,
+       .num_links = 0,
+};
+
+static struct qcom_icc_node qhs_mss_cfg = {
+       .name = "qhs_mss_cfg",
+       .id = SM8650_SLAVE_CNOC_MSS,
+       .channels = 1,
+       .buswidth = 4,
+       .num_links = 0,
+};
+
+static struct qcom_icc_node qhs_mx_2_rdpm = {
+       .name = "qhs_mx_2_rdpm",
+       .id = SM8650_SLAVE_MX_2_RDPM,
+       .channels = 1,
+       .buswidth = 4,
+       .num_links = 0,
+};
+
+static struct qcom_icc_node qhs_mx_rdpm = {
+       .name = "qhs_mx_rdpm",
+       .id = SM8650_SLAVE_MX_RDPM,
+       .channels = 1,
+       .buswidth = 4,
+       .num_links = 0,
+};
+
+static struct qcom_icc_node qhs_pcie0_cfg = {
+       .name = "qhs_pcie0_cfg",
+       .id = SM8650_SLAVE_PCIE_0_CFG,
+       .channels = 1,
+       .buswidth = 4,
+       .num_links = 0,
+};
+
+static struct qcom_icc_node qhs_pcie1_cfg = {
+       .name = "qhs_pcie1_cfg",
+       .id = SM8650_SLAVE_PCIE_1_CFG,
+       .channels = 1,
+       .buswidth = 4,
+       .num_links = 0,
+};
+
+static struct qcom_icc_node qhs_pcie_rscc = {
+       .name = "qhs_pcie_rscc",
+       .id = SM8650_SLAVE_PCIE_RSCC,
+       .channels = 1,
+       .buswidth = 4,
+       .num_links = 0,
+};
+
+static struct qcom_icc_node qhs_pdm = {
+       .name = "qhs_pdm",
+       .id = SM8650_SLAVE_PDM,
+       .channels = 1,
+       .buswidth = 4,
+       .num_links = 0,
+};
+
+static struct qcom_icc_node qhs_prng = {
+       .name = "qhs_prng",
+       .id = SM8650_SLAVE_PRNG,
+       .channels = 1,
+       .buswidth = 4,
+       .num_links = 0,
+};
+
+static struct qcom_icc_node qhs_qdss_cfg = {
+       .name = "qhs_qdss_cfg",
+       .id = SM8650_SLAVE_QDSS_CFG,
+       .channels = 1,
+       .buswidth = 4,
+       .num_links = 0,
+};
+
+static struct qcom_icc_node qhs_qspi = {
+       .name = "qhs_qspi",
+       .id = SM8650_SLAVE_QSPI_0,
+       .channels = 1,
+       .buswidth = 4,
+       .num_links = 0,
+};
+
+static struct qcom_icc_node qhs_qup02 = {
+       .name = "qhs_qup02",
+       .id = SM8650_SLAVE_QUP_3,
+       .channels = 1,
+       .buswidth = 4,
+       .num_links = 0,
+};
+
+static struct qcom_icc_node qhs_qup1 = {
+       .name = "qhs_qup1",
+       .id = SM8650_SLAVE_QUP_1,
+       .channels = 1,
+       .buswidth = 4,
+       .num_links = 0,
+};
+
+static struct qcom_icc_node qhs_qup2 = {
+       .name = "qhs_qup2",
+       .id = SM8650_SLAVE_QUP_2,
+       .channels = 1,
+       .buswidth = 4,
+       .num_links = 0,
+};
+
+static struct qcom_icc_node qhs_sdc2 = {
+       .name = "qhs_sdc2",
+       .id = SM8650_SLAVE_SDCC_2,
+       .channels = 1,
+       .buswidth = 4,
+       .num_links = 0,
+};
+
+static struct qcom_icc_node qhs_sdc4 = {
+       .name = "qhs_sdc4",
+       .id = SM8650_SLAVE_SDCC_4,
+       .channels = 1,
+       .buswidth = 4,
+       .num_links = 0,
+};
+
+static struct qcom_icc_node qhs_spss_cfg = {
+       .name = "qhs_spss_cfg",
+       .id = SM8650_SLAVE_SPSS_CFG,
+       .channels = 1,
+       .buswidth = 4,
+       .num_links = 0,
+};
+
+static struct qcom_icc_node qhs_tcsr = {
+       .name = "qhs_tcsr",
+       .id = SM8650_SLAVE_TCSR,
+       .channels = 1,
+       .buswidth = 4,
+       .num_links = 0,
+};
+
+static struct qcom_icc_node qhs_tlmm = {
+       .name = "qhs_tlmm",
+       .id = SM8650_SLAVE_TLMM,
+       .channels = 1,
+       .buswidth = 4,
+       .num_links = 0,
+};
+
+static struct qcom_icc_node qhs_ufs_mem_cfg = {
+       .name = "qhs_ufs_mem_cfg",
+       .id = SM8650_SLAVE_UFS_MEM_CFG,
+       .channels = 1,
+       .buswidth = 4,
+       .num_links = 0,
+};
+
+static struct qcom_icc_node qhs_usb3_0 = {
+       .name = "qhs_usb3_0",
+       .id = SM8650_SLAVE_USB3_0,
+       .channels = 1,
+       .buswidth = 4,
+       .num_links = 0,
+};
+
+static struct qcom_icc_node qhs_venus_cfg = {
+       .name = "qhs_venus_cfg",
+       .id = SM8650_SLAVE_VENUS_CFG,
+       .channels = 1,
+       .buswidth = 4,
+       .num_links = 0,
+};
+
+static struct qcom_icc_node qhs_vsense_ctrl_cfg = {
+       .name = "qhs_vsense_ctrl_cfg",
+       .id = SM8650_SLAVE_VSENSE_CTRL_CFG,
+       .channels = 1,
+       .buswidth = 4,
+       .num_links = 0,
+};
+
+static struct qcom_icc_node qss_mnoc_cfg = {
+       .name = "qss_mnoc_cfg",
+       .id = SM8650_SLAVE_CNOC_MNOC_CFG,
+       .channels = 1,
+       .buswidth = 4,
+       .num_links = 1,
+       .links = { SM8650_MASTER_CNOC_MNOC_CFG },
+};
+
+static struct qcom_icc_node qss_nsp_qtb_cfg = {
+       .name = "qss_nsp_qtb_cfg",
+       .id = SM8650_SLAVE_NSP_QTB_CFG,
+       .channels = 1,
+       .buswidth = 4,
+       .num_links = 0,
+};
+
+static struct qcom_icc_node qss_pcie_anoc_cfg = {
+       .name = "qss_pcie_anoc_cfg",
+       .id = SM8650_SLAVE_PCIE_ANOC_CFG,
+       .channels = 1,
+       .buswidth = 4,
+       .num_links = 1,
+       .links = { SM8650_MASTER_PCIE_ANOC_CFG },
+};
+
+static struct qcom_icc_node srvc_cnoc_cfg = {
+       .name = "srvc_cnoc_cfg",
+       .id = SM8650_SLAVE_SERVICE_CNOC_CFG,
+       .channels = 1,
+       .buswidth = 4,
+       .num_links = 0,
+};
+
+static struct qcom_icc_node xs_qdss_stm = {
+       .name = "xs_qdss_stm",
+       .id = SM8650_SLAVE_QDSS_STM,
+       .channels = 1,
+       .buswidth = 4,
+       .num_links = 0,
+};
+
+static struct qcom_icc_node xs_sys_tcu_cfg = {
+       .name = "xs_sys_tcu_cfg",
+       .id = SM8650_SLAVE_TCU,
+       .channels = 1,
+       .buswidth = 8,
+       .num_links = 0,
+};
+
+static struct qcom_icc_node qhs_aoss = {
+       .name = "qhs_aoss",
+       .id = SM8650_SLAVE_AOSS,
+       .channels = 1,
+       .buswidth = 4,
+       .num_links = 0,
+};
+
+static struct qcom_icc_node qhs_ipa = {
+       .name = "qhs_ipa",
+       .id = SM8650_SLAVE_IPA_CFG,
+       .channels = 1,
+       .buswidth = 4,
+       .num_links = 0,
+};
+
+static struct qcom_icc_node qhs_ipc_router = {
+       .name = "qhs_ipc_router",
+       .id = SM8650_SLAVE_IPC_ROUTER_CFG,
+       .channels = 1,
+       .buswidth = 4,
+       .num_links = 0,
+};
+
+static struct qcom_icc_node qhs_tme_cfg = {
+       .name = "qhs_tme_cfg",
+       .id = SM8650_SLAVE_TME_CFG,
+       .channels = 1,
+       .buswidth = 4,
+       .num_links = 0,
+};
+
+static struct qcom_icc_node qss_apss = {
+       .name = "qss_apss",
+       .id = SM8650_SLAVE_APPSS,
+       .channels = 1,
+       .buswidth = 4,
+       .num_links = 0,
+};
+
+static struct qcom_icc_node qss_cfg = {
+       .name = "qss_cfg",
+       .id = SM8650_SLAVE_CNOC_CFG,
+       .channels = 1,
+       .buswidth = 4,
+       .num_links = 1,
+       .links = { SM8650_MASTER_CNOC_CFG },
+};
+
+static struct qcom_icc_node qss_ddrss_cfg = {
+       .name = "qss_ddrss_cfg",
+       .id = SM8650_SLAVE_DDRSS_CFG,
+       .channels = 1,
+       .buswidth = 4,
+       .num_links = 0,
+};
+
+static struct qcom_icc_node qxs_imem = {
+       .name = "qxs_imem",
+       .id = SM8650_SLAVE_IMEM,
+       .channels = 1,
+       .buswidth = 8,
+       .num_links = 0,
+};
+
+static struct qcom_icc_node srvc_cnoc_main = {
+       .name = "srvc_cnoc_main",
+       .id = SM8650_SLAVE_SERVICE_CNOC,
+       .channels = 1,
+       .buswidth = 4,
+       .num_links = 0,
+};
+
+static struct qcom_icc_node xs_pcie_0 = {
+       .name = "xs_pcie_0",
+       .id = SM8650_SLAVE_PCIE_0,
+       .channels = 1,
+       .buswidth = 8,
+       .num_links = 0,
+};
+
+static struct qcom_icc_node xs_pcie_1 = {
+       .name = "xs_pcie_1",
+       .id = SM8650_SLAVE_PCIE_1,
+       .channels = 1,
+       .buswidth = 16,
+       .num_links = 0,
+};
+
+static struct qcom_icc_node qns_gem_noc_cnoc = {
+       .name = "qns_gem_noc_cnoc",
+       .id = SM8650_SLAVE_GEM_NOC_CNOC,
+       .channels = 1,
+       .buswidth = 16,
+       .num_links = 1,
+       .links = { SM8650_MASTER_GEM_NOC_CNOC },
+};
+
+static struct qcom_icc_node qns_llcc = {
+       .name = "qns_llcc",
+       .id = SM8650_SLAVE_LLCC,
+       .channels = 4,
+       .buswidth = 16,
+       .num_links = 1,
+       .links = { SM8650_MASTER_LLCC },
+};
+
+static struct qcom_icc_node qns_pcie = {
+       .name = "qns_pcie",
+       .id = SM8650_SLAVE_MEM_NOC_PCIE_SNOC,
+       .channels = 1,
+       .buswidth = 8,
+       .num_links = 1,
+       .links = { SM8650_MASTER_GEM_NOC_PCIE_SNOC },
+};
+
+static struct qcom_icc_node qns_lpass_ag_noc_gemnoc = {
+       .name = "qns_lpass_ag_noc_gemnoc",
+       .id = SM8650_SLAVE_LPASS_GEM_NOC,
+       .channels = 1,
+       .buswidth = 16,
+       .num_links = 1,
+       .links = { SM8650_MASTER_LPASS_GEM_NOC },
+};
+
+static struct qcom_icc_node qns_lpass_aggnoc = {
+       .name = "qns_lpass_aggnoc",
+       .id = SM8650_SLAVE_LPIAON_NOC_LPASS_AG_NOC,
+       .channels = 1,
+       .buswidth = 16,
+       .num_links = 1,
+       .links = { SM8650_MASTER_LPIAON_NOC },
+};
+
+static struct qcom_icc_node qns_lpi_aon_noc = {
+       .name = "qns_lpi_aon_noc",
+       .id = SM8650_SLAVE_LPICX_NOC_LPIAON_NOC,
+       .channels = 1,
+       .buswidth = 16,
+       .num_links = 1,
+       .links = { SM8650_MASTER_LPASS_LPINOC },
+};
+
+static struct qcom_icc_node ebi = {
+       .name = "ebi",
+       .id = SM8650_SLAVE_EBI1,
+       .channels = 4,
+       .buswidth = 4,
+       .num_links = 0,
+};
+
+static struct qcom_icc_node qns_mem_noc_hf = {
+       .name = "qns_mem_noc_hf",
+       .id = SM8650_SLAVE_MNOC_HF_MEM_NOC,
+       .channels = 2,
+       .buswidth = 32,
+       .num_links = 1,
+       .links = { SM8650_MASTER_MNOC_HF_MEM_NOC },
+};
+
+static struct qcom_icc_node qns_mem_noc_sf = {
+       .name = "qns_mem_noc_sf",
+       .id = SM8650_SLAVE_MNOC_SF_MEM_NOC,
+       .channels = 2,
+       .buswidth = 32,
+       .num_links = 1,
+       .links = { SM8650_MASTER_MNOC_SF_MEM_NOC },
+};
+
+static struct qcom_icc_node srvc_mnoc = {
+       .name = "srvc_mnoc",
+       .id = SM8650_SLAVE_SERVICE_MNOC,
+       .channels = 1,
+       .buswidth = 4,
+       .num_links = 0,
+};
+
+static struct qcom_icc_node qns_nsp_gemnoc = {
+       .name = "qns_nsp_gemnoc",
+       .id = SM8650_SLAVE_CDSP_MEM_NOC,
+       .channels = 2,
+       .buswidth = 32,
+       .num_links = 1,
+       .links = { SM8650_MASTER_COMPUTE_NOC },
+};
+
+static struct qcom_icc_node qns_pcie_mem_noc = {
+       .name = "qns_pcie_mem_noc",
+       .id = SM8650_SLAVE_ANOC_PCIE_GEM_NOC,
+       .channels = 1,
+       .buswidth = 16,
+       .num_links = 1,
+       .links = { SM8650_MASTER_ANOC_PCIE_GEM_NOC },
+};
+
+static struct qcom_icc_node srvc_pcie_aggre_noc = {
+       .name = "srvc_pcie_aggre_noc",
+       .id = SM8650_SLAVE_SERVICE_PCIE_ANOC,
+       .channels = 1,
+       .buswidth = 4,
+       .num_links = 0,
+};
+
+static struct qcom_icc_node qns_gemnoc_sf = {
+       .name = "qns_gemnoc_sf",
+       .id = SM8650_SLAVE_SNOC_GEM_NOC_SF,
+       .channels = 1,
+       .buswidth = 16,
+       .num_links = 1,
+       .links = { SM8650_MASTER_SNOC_SF_MEM_NOC },
+};
+
+static struct qcom_icc_bcm bcm_acv = {
+       .name = "ACV",
+       .enable_mask = BIT(3),
+       .num_nodes = 1,
+       .nodes = { &ebi },
+};
+
+static struct qcom_icc_bcm bcm_ce0 = {
+       .name = "CE0",
+       .num_nodes = 1,
+       .nodes = { &qxm_crypto },
+};
+
+static struct qcom_icc_bcm bcm_cn0 = {
+       .name = "CN0",
+       .enable_mask = BIT(0),
+       .keepalive = true,
+       .num_nodes = 59,
+       .nodes = { &qsm_cfg, &qhs_ahb2phy0,
+                  &qhs_ahb2phy1, &qhs_camera_cfg,
+                  &qhs_clk_ctl, &qhs_cpr_cx,
+                  &qhs_cpr_hmx, &qhs_cpr_mmcx,
+                  &qhs_cpr_mxa, &qhs_cpr_mxc,
+                  &qhs_cpr_nspcx, &qhs_crypto0_cfg,
+                  &qhs_cx_rdpm, &qhs_display_cfg,
+                  &qhs_gpuss_cfg, &qhs_i2c,
+                  &qhs_i3c_ibi0_cfg, &qhs_i3c_ibi1_cfg,
+                  &qhs_imem_cfg, &qhs_mss_cfg,
+                  &qhs_mx_2_rdpm, &qhs_mx_rdpm,
+                  &qhs_pcie0_cfg, &qhs_pcie1_cfg,
+                  &qhs_pcie_rscc, &qhs_pdm,
+                  &qhs_prng, &qhs_qdss_cfg,
+                  &qhs_qspi, &qhs_qup02,
+                  &qhs_qup1, &qhs_qup2,
+                  &qhs_sdc2, &qhs_sdc4,
+                  &qhs_spss_cfg, &qhs_tcsr,
+                  &qhs_tlmm, &qhs_ufs_mem_cfg,
+                  &qhs_usb3_0, &qhs_venus_cfg,
+                  &qhs_vsense_ctrl_cfg, &qss_mnoc_cfg,
+                  &qss_nsp_qtb_cfg, &qss_pcie_anoc_cfg,
+                  &srvc_cnoc_cfg, &xs_qdss_stm,
+                  &xs_sys_tcu_cfg, &qnm_gemnoc_cnoc,
+                  &qnm_gemnoc_pcie, &qhs_aoss,
+                  &qhs_ipa, &qhs_ipc_router,
+                  &qhs_tme_cfg, &qss_apss,
+                  &qss_cfg, &qss_ddrss_cfg,
+                  &qxs_imem, &srvc_cnoc_main,
+                  &xs_pcie_0, &xs_pcie_1 },
+};
+
+static struct qcom_icc_bcm bcm_co0 = {
+       .name = "CO0",
+       .enable_mask = BIT(0),
+       .num_nodes = 2,
+       .nodes = { &qnm_nsp, &qns_nsp_gemnoc },
+};
+
+static struct qcom_icc_bcm bcm_lp0 = {
+       .name = "LP0",
+       .num_nodes = 2,
+       .nodes = { &qnm_lpass_lpinoc, &qns_lpass_aggnoc },
+};
+
+static struct qcom_icc_bcm bcm_mc0 = {
+       .name = "MC0",
+       .keepalive = true,
+       .num_nodes = 1,
+       .nodes = { &ebi },
+};
+
+static struct qcom_icc_bcm bcm_mm0 = {
+       .name = "MM0",
+       .num_nodes = 1,
+       .nodes = { &qns_mem_noc_hf },
+};
+
+static struct qcom_icc_bcm bcm_mm1 = {
+       .name = "MM1",
+       .enable_mask = BIT(0),
+       .num_nodes = 8,
+       .nodes = { &qnm_camnoc_hf, &qnm_camnoc_icp,
+                  &qnm_camnoc_sf, &qnm_vapss_hcp,
+                  &qnm_video_cv_cpu, &qnm_video_cvp,
+                  &qnm_video_v_cpu, &qns_mem_noc_sf },
+};
+
+static struct qcom_icc_bcm bcm_qup0 = {
+       .name = "QUP0",
+       .keepalive = true,
+       .vote_scale = 1,
+       .num_nodes = 1,
+       .nodes = { &qup0_core_slave },
+};
+
+static struct qcom_icc_bcm bcm_qup1 = {
+       .name = "QUP1",
+       .keepalive = true,
+       .vote_scale = 1,
+       .num_nodes = 1,
+       .nodes = { &qup1_core_slave },
+};
+
+static struct qcom_icc_bcm bcm_qup2 = {
+       .name = "QUP2",
+       .keepalive = true,
+       .vote_scale = 1,
+       .num_nodes = 1,
+       .nodes = { &qup2_core_slave },
+};
+
+static struct qcom_icc_bcm bcm_sh0 = {
+       .name = "SH0",
+       .keepalive = true,
+       .num_nodes = 1,
+       .nodes = { &qns_llcc },
+};
+
+static struct qcom_icc_bcm bcm_sh1 = {
+       .name = "SH1",
+       .enable_mask = BIT(0),
+       .num_nodes = 15,
+       .nodes = { &alm_gpu_tcu, &alm_sys_tcu,
+                  &alm_ubwc_p_tcu, &chm_apps,
+                  &qnm_gpu, &qnm_mdsp,
+                  &qnm_mnoc_hf, &qnm_mnoc_sf,
+                  &qnm_nsp_gemnoc, &qnm_pcie,
+                  &qnm_snoc_sf, &qnm_ubwc_p,
+                  &xm_gic, &qns_gem_noc_cnoc,
+                  &qns_pcie },
+};
+
+static struct qcom_icc_bcm bcm_sn0 = {
+       .name = "SN0",
+       .keepalive = true,
+       .num_nodes = 1,
+       .nodes = { &qns_gemnoc_sf },
+};
+
+static struct qcom_icc_bcm bcm_sn2 = {
+       .name = "SN2",
+       .num_nodes = 1,
+       .nodes = { &qnm_aggre1_noc },
+};
+
+static struct qcom_icc_bcm bcm_sn3 = {
+       .name = "SN3",
+       .num_nodes = 1,
+       .nodes = { &qnm_aggre2_noc },
+};
+
+static struct qcom_icc_bcm bcm_sn4 = {
+       .name = "SN4",
+       .num_nodes = 1,
+       .nodes = { &qns_pcie_mem_noc },
+};
+
+static struct qcom_icc_node * const aggre1_noc_nodes[] = {
+       [MASTER_QSPI_0] = &qhm_qspi,
+       [MASTER_QUP_1] = &qhm_qup1,
+       [MASTER_QUP_3] = &qxm_qup02,
+       [MASTER_SDCC_4] = &xm_sdc4,
+       [MASTER_UFS_MEM] = &xm_ufs_mem,
+       [MASTER_USB3_0] = &xm_usb3_0,
+       [SLAVE_A1NOC_SNOC] = &qns_a1noc_snoc,
+};
+
+static const struct qcom_icc_desc sm8650_aggre1_noc = {
+       .nodes = aggre1_noc_nodes,
+       .num_nodes = ARRAY_SIZE(aggre1_noc_nodes),
+};
+
+static struct qcom_icc_bcm * const aggre2_noc_bcms[] = {
+       &bcm_ce0,
+};
+
+static struct qcom_icc_node * const aggre2_noc_nodes[] = {
+       [MASTER_QDSS_BAM] = &qhm_qdss_bam,
+       [MASTER_QUP_2] = &qhm_qup2,
+       [MASTER_CRYPTO] = &qxm_crypto,
+       [MASTER_IPA] = &qxm_ipa,
+       [MASTER_SP] = &qxm_sp,
+       [MASTER_QDSS_ETR] = &xm_qdss_etr_0,
+       [MASTER_QDSS_ETR_1] = &xm_qdss_etr_1,
+       [MASTER_SDCC_2] = &xm_sdc2,
+       [SLAVE_A2NOC_SNOC] = &qns_a2noc_snoc,
+};
+
+static const struct qcom_icc_desc sm8650_aggre2_noc = {
+       .nodes = aggre2_noc_nodes,
+       .num_nodes = ARRAY_SIZE(aggre2_noc_nodes),
+       .bcms = aggre2_noc_bcms,
+       .num_bcms = ARRAY_SIZE(aggre2_noc_bcms),
+};
+
+static struct qcom_icc_bcm * const clk_virt_bcms[] = {
+       &bcm_qup0,
+       &bcm_qup1,
+       &bcm_qup2,
+};
+
+static struct qcom_icc_node * const clk_virt_nodes[] = {
+       [MASTER_QUP_CORE_0] = &qup0_core_master,
+       [MASTER_QUP_CORE_1] = &qup1_core_master,
+       [MASTER_QUP_CORE_2] = &qup2_core_master,
+       [SLAVE_QUP_CORE_0] = &qup0_core_slave,
+       [SLAVE_QUP_CORE_1] = &qup1_core_slave,
+       [SLAVE_QUP_CORE_2] = &qup2_core_slave,
+};
+
+static const struct qcom_icc_desc sm8650_clk_virt = {
+       .nodes = clk_virt_nodes,
+       .num_nodes = ARRAY_SIZE(clk_virt_nodes),
+       .bcms = clk_virt_bcms,
+       .num_bcms = ARRAY_SIZE(clk_virt_bcms),
+};
+
+static struct qcom_icc_bcm * const config_noc_bcms[] = {
+       &bcm_cn0,
+};
+
+static struct qcom_icc_node * const config_noc_nodes[] = {
+       [MASTER_CNOC_CFG] = &qsm_cfg,
+       [SLAVE_AHB2PHY_SOUTH] = &qhs_ahb2phy0,
+       [SLAVE_AHB2PHY_NORTH] = &qhs_ahb2phy1,
+       [SLAVE_CAMERA_CFG] = &qhs_camera_cfg,
+       [SLAVE_CLK_CTL] = &qhs_clk_ctl,
+       [SLAVE_RBCPR_CX_CFG] = &qhs_cpr_cx,
+       [SLAVE_CPR_HMX] = &qhs_cpr_hmx,
+       [SLAVE_RBCPR_MMCX_CFG] = &qhs_cpr_mmcx,
+       [SLAVE_RBCPR_MXA_CFG] = &qhs_cpr_mxa,
+       [SLAVE_RBCPR_MXC_CFG] = &qhs_cpr_mxc,
+       [SLAVE_CPR_NSPCX] = &qhs_cpr_nspcx,
+       [SLAVE_CRYPTO_0_CFG] = &qhs_crypto0_cfg,
+       [SLAVE_CX_RDPM] = &qhs_cx_rdpm,
+       [SLAVE_DISPLAY_CFG] = &qhs_display_cfg,
+       [SLAVE_GFX3D_CFG] = &qhs_gpuss_cfg,
+       [SLAVE_I2C] = &qhs_i2c,
+       [SLAVE_I3C_IBI0_CFG] = &qhs_i3c_ibi0_cfg,
+       [SLAVE_I3C_IBI1_CFG] = &qhs_i3c_ibi1_cfg,
+       [SLAVE_IMEM_CFG] = &qhs_imem_cfg,
+       [SLAVE_CNOC_MSS] = &qhs_mss_cfg,
+       [SLAVE_MX_2_RDPM] = &qhs_mx_2_rdpm,
+       [SLAVE_MX_RDPM] = &qhs_mx_rdpm,
+       [SLAVE_PCIE_0_CFG] = &qhs_pcie0_cfg,
+       [SLAVE_PCIE_1_CFG] = &qhs_pcie1_cfg,
+       [SLAVE_PCIE_RSCC] = &qhs_pcie_rscc,
+       [SLAVE_PDM] = &qhs_pdm,
+       [SLAVE_PRNG] = &qhs_prng,
+       [SLAVE_QDSS_CFG] = &qhs_qdss_cfg,
+       [SLAVE_QSPI_0] = &qhs_qspi,
+       [SLAVE_QUP_3] = &qhs_qup02,
+       [SLAVE_QUP_1] = &qhs_qup1,
+       [SLAVE_QUP_2] = &qhs_qup2,
+       [SLAVE_SDCC_2] = &qhs_sdc2,
+       [SLAVE_SDCC_4] = &qhs_sdc4,
+       [SLAVE_SPSS_CFG] = &qhs_spss_cfg,
+       [SLAVE_TCSR] = &qhs_tcsr,
+       [SLAVE_TLMM] = &qhs_tlmm,
+       [SLAVE_UFS_MEM_CFG] = &qhs_ufs_mem_cfg,
+       [SLAVE_USB3_0] = &qhs_usb3_0,
+       [SLAVE_VENUS_CFG] = &qhs_venus_cfg,
+       [SLAVE_VSENSE_CTRL_CFG] = &qhs_vsense_ctrl_cfg,
+       [SLAVE_CNOC_MNOC_CFG] = &qss_mnoc_cfg,
+       [SLAVE_NSP_QTB_CFG] = &qss_nsp_qtb_cfg,
+       [SLAVE_PCIE_ANOC_CFG] = &qss_pcie_anoc_cfg,
+       [SLAVE_SERVICE_CNOC_CFG] = &srvc_cnoc_cfg,
+       [SLAVE_QDSS_STM] = &xs_qdss_stm,
+       [SLAVE_TCU] = &xs_sys_tcu_cfg,
+};
+
+static const struct qcom_icc_desc sm8650_config_noc = {
+       .nodes = config_noc_nodes,
+       .num_nodes = ARRAY_SIZE(config_noc_nodes),
+       .bcms = config_noc_bcms,
+       .num_bcms = ARRAY_SIZE(config_noc_bcms),
+};
+
+static struct qcom_icc_bcm * const cnoc_main_bcms[] = {
+       &bcm_cn0,
+};
+
+static struct qcom_icc_node * const cnoc_main_nodes[] = {
+       [MASTER_GEM_NOC_CNOC] = &qnm_gemnoc_cnoc,
+       [MASTER_GEM_NOC_PCIE_SNOC] = &qnm_gemnoc_pcie,
+       [SLAVE_AOSS] = &qhs_aoss,
+       [SLAVE_IPA_CFG] = &qhs_ipa,
+       [SLAVE_IPC_ROUTER_CFG] = &qhs_ipc_router,
+       [SLAVE_TME_CFG] = &qhs_tme_cfg,
+       [SLAVE_APPSS] = &qss_apss,
+       [SLAVE_CNOC_CFG] = &qss_cfg,
+       [SLAVE_DDRSS_CFG] = &qss_ddrss_cfg,
+       [SLAVE_IMEM] = &qxs_imem,
+       [SLAVE_SERVICE_CNOC] = &srvc_cnoc_main,
+       [SLAVE_PCIE_0] = &xs_pcie_0,
+       [SLAVE_PCIE_1] = &xs_pcie_1,
+};
+
+static const struct qcom_icc_desc sm8650_cnoc_main = {
+       .nodes = cnoc_main_nodes,
+       .num_nodes = ARRAY_SIZE(cnoc_main_nodes),
+       .bcms = cnoc_main_bcms,
+       .num_bcms = ARRAY_SIZE(cnoc_main_bcms),
+};
+
+static struct qcom_icc_bcm * const gem_noc_bcms[] = {
+       &bcm_sh0,
+       &bcm_sh1,
+};
+
+static struct qcom_icc_node * const gem_noc_nodes[] = {
+       [MASTER_GPU_TCU] = &alm_gpu_tcu,
+       [MASTER_SYS_TCU] = &alm_sys_tcu,
+       [MASTER_UBWC_P_TCU] = &alm_ubwc_p_tcu,
+       [MASTER_APPSS_PROC] = &chm_apps,
+       [MASTER_GFX3D] = &qnm_gpu,
+       [MASTER_LPASS_GEM_NOC] = &qnm_lpass_gemnoc,
+       [MASTER_MSS_PROC] = &qnm_mdsp,
+       [MASTER_MNOC_HF_MEM_NOC] = &qnm_mnoc_hf,
+       [MASTER_MNOC_SF_MEM_NOC] = &qnm_mnoc_sf,
+       [MASTER_COMPUTE_NOC] = &qnm_nsp_gemnoc,
+       [MASTER_ANOC_PCIE_GEM_NOC] = &qnm_pcie,
+       [MASTER_SNOC_SF_MEM_NOC] = &qnm_snoc_sf,
+       [MASTER_UBWC_P] = &qnm_ubwc_p,
+       [MASTER_GIC] = &xm_gic,
+       [SLAVE_GEM_NOC_CNOC] = &qns_gem_noc_cnoc,
+       [SLAVE_LLCC] = &qns_llcc,
+       [SLAVE_MEM_NOC_PCIE_SNOC] = &qns_pcie,
+};
+
+static const struct qcom_icc_desc sm8650_gem_noc = {
+       .nodes = gem_noc_nodes,
+       .num_nodes = ARRAY_SIZE(gem_noc_nodes),
+       .bcms = gem_noc_bcms,
+       .num_bcms = ARRAY_SIZE(gem_noc_bcms),
+};
+
+static struct qcom_icc_node * const lpass_ag_noc_nodes[] = {
+       [MASTER_LPIAON_NOC] = &qnm_lpiaon_noc,
+       [SLAVE_LPASS_GEM_NOC] = &qns_lpass_ag_noc_gemnoc,
+};
+
+static const struct qcom_icc_desc sm8650_lpass_ag_noc = {
+       .nodes = lpass_ag_noc_nodes,
+       .num_nodes = ARRAY_SIZE(lpass_ag_noc_nodes),
+};
+
+static struct qcom_icc_bcm * const lpass_lpiaon_noc_bcms[] = {
+       &bcm_lp0,
+};
+
+static struct qcom_icc_node * const lpass_lpiaon_noc_nodes[] = {
+       [MASTER_LPASS_LPINOC] = &qnm_lpass_lpinoc,
+       [SLAVE_LPIAON_NOC_LPASS_AG_NOC] = &qns_lpass_aggnoc,
+};
+
+static const struct qcom_icc_desc sm8650_lpass_lpiaon_noc = {
+       .nodes = lpass_lpiaon_noc_nodes,
+       .num_nodes = ARRAY_SIZE(lpass_lpiaon_noc_nodes),
+       .bcms = lpass_lpiaon_noc_bcms,
+       .num_bcms = ARRAY_SIZE(lpass_lpiaon_noc_bcms),
+};
+
+static struct qcom_icc_node * const lpass_lpicx_noc_nodes[] = {
+       [MASTER_LPASS_PROC] = &qxm_lpinoc_dsp_axim,
+       [SLAVE_LPICX_NOC_LPIAON_NOC] = &qns_lpi_aon_noc,
+};
+
+static const struct qcom_icc_desc sm8650_lpass_lpicx_noc = {
+       .nodes = lpass_lpicx_noc_nodes,
+       .num_nodes = ARRAY_SIZE(lpass_lpicx_noc_nodes),
+};
+
+static struct qcom_icc_bcm * const mc_virt_bcms[] = {
+       &bcm_acv,
+       &bcm_mc0,
+};
+
+static struct qcom_icc_node * const mc_virt_nodes[] = {
+       [MASTER_LLCC] = &llcc_mc,
+       [SLAVE_EBI1] = &ebi,
+};
+
+static const struct qcom_icc_desc sm8650_mc_virt = {
+       .nodes = mc_virt_nodes,
+       .num_nodes = ARRAY_SIZE(mc_virt_nodes),
+       .bcms = mc_virt_bcms,
+       .num_bcms = ARRAY_SIZE(mc_virt_bcms),
+};
+
+static struct qcom_icc_bcm * const mmss_noc_bcms[] = {
+       &bcm_mm0,
+       &bcm_mm1,
+};
+
+static struct qcom_icc_node * const mmss_noc_nodes[] = {
+       [MASTER_CAMNOC_HF] = &qnm_camnoc_hf,
+       [MASTER_CAMNOC_ICP] = &qnm_camnoc_icp,
+       [MASTER_CAMNOC_SF] = &qnm_camnoc_sf,
+       [MASTER_MDP] = &qnm_mdp,
+       [MASTER_CDSP_HCP] = &qnm_vapss_hcp,
+       [MASTER_VIDEO] = &qnm_video,
+       [MASTER_VIDEO_CV_PROC] = &qnm_video_cv_cpu,
+       [MASTER_VIDEO_PROC] = &qnm_video_cvp,
+       [MASTER_VIDEO_V_PROC] = &qnm_video_v_cpu,
+       [MASTER_CNOC_MNOC_CFG] = &qsm_mnoc_cfg,
+       [SLAVE_MNOC_HF_MEM_NOC] = &qns_mem_noc_hf,
+       [SLAVE_MNOC_SF_MEM_NOC] = &qns_mem_noc_sf,
+       [SLAVE_SERVICE_MNOC] = &srvc_mnoc,
+};
+
+static const struct qcom_icc_desc sm8650_mmss_noc = {
+       .nodes = mmss_noc_nodes,
+       .num_nodes = ARRAY_SIZE(mmss_noc_nodes),
+       .bcms = mmss_noc_bcms,
+       .num_bcms = ARRAY_SIZE(mmss_noc_bcms),
+};
+
+static struct qcom_icc_bcm * const nsp_noc_bcms[] = {
+       &bcm_co0,
+};
+
+static struct qcom_icc_node * const nsp_noc_nodes[] = {
+       [MASTER_CDSP_PROC] = &qnm_nsp,
+       [SLAVE_CDSP_MEM_NOC] = &qns_nsp_gemnoc,
+};
+
+static const struct qcom_icc_desc sm8650_nsp_noc = {
+       .nodes = nsp_noc_nodes,
+       .num_nodes = ARRAY_SIZE(nsp_noc_nodes),
+       .bcms = nsp_noc_bcms,
+       .num_bcms = ARRAY_SIZE(nsp_noc_bcms),
+};
+
+static struct qcom_icc_bcm * const pcie_anoc_bcms[] = {
+       &bcm_sn4,
+};
+
+static struct qcom_icc_node * const pcie_anoc_nodes[] = {
+       [MASTER_PCIE_ANOC_CFG] = &qsm_pcie_anoc_cfg,
+       [MASTER_PCIE_0] = &xm_pcie3_0,
+       [MASTER_PCIE_1] = &xm_pcie3_1,
+       [SLAVE_ANOC_PCIE_GEM_NOC] = &qns_pcie_mem_noc,
+       [SLAVE_SERVICE_PCIE_ANOC] = &srvc_pcie_aggre_noc,
+};
+
+static const struct qcom_icc_desc sm8650_pcie_anoc = {
+       .nodes = pcie_anoc_nodes,
+       .num_nodes = ARRAY_SIZE(pcie_anoc_nodes),
+       .bcms = pcie_anoc_bcms,
+       .num_bcms = ARRAY_SIZE(pcie_anoc_bcms),
+};
+
+static struct qcom_icc_bcm * const system_noc_bcms[] = {
+       &bcm_sn0,
+       &bcm_sn2,
+       &bcm_sn3,
+};
+
+static struct qcom_icc_node * const system_noc_nodes[] = {
+       [MASTER_A1NOC_SNOC] = &qnm_aggre1_noc,
+       [MASTER_A2NOC_SNOC] = &qnm_aggre2_noc,
+       [SLAVE_SNOC_GEM_NOC_SF] = &qns_gemnoc_sf,
+};
+
+static const struct qcom_icc_desc sm8650_system_noc = {
+       .nodes = system_noc_nodes,
+       .num_nodes = ARRAY_SIZE(system_noc_nodes),
+       .bcms = system_noc_bcms,
+       .num_bcms = ARRAY_SIZE(system_noc_bcms),
+};
+
+static const struct of_device_id qnoc_of_match[] = {
+       { .compatible = "qcom,sm8650-aggre1-noc", .data = &sm8650_aggre1_noc },
+       { .compatible = "qcom,sm8650-aggre2-noc", .data = &sm8650_aggre2_noc },
+       { .compatible = "qcom,sm8650-clk-virt", .data = &sm8650_clk_virt },
+       { .compatible = "qcom,sm8650-config-noc", .data = &sm8650_config_noc },
+       { .compatible = "qcom,sm8650-cnoc-main", .data = &sm8650_cnoc_main },
+       { .compatible = "qcom,sm8650-gem-noc", .data = &sm8650_gem_noc },
+       { .compatible = "qcom,sm8650-lpass-ag-noc", .data = &sm8650_lpass_ag_noc },
+       { .compatible = "qcom,sm8650-lpass-lpiaon-noc", .data = &sm8650_lpass_lpiaon_noc },
+       { .compatible = "qcom,sm8650-lpass-lpicx-noc", .data = &sm8650_lpass_lpicx_noc },
+       { .compatible = "qcom,sm8650-mc-virt", .data = &sm8650_mc_virt },
+       { .compatible = "qcom,sm8650-mmss-noc", .data = &sm8650_mmss_noc },
+       { .compatible = "qcom,sm8650-nsp-noc", .data = &sm8650_nsp_noc },
+       { .compatible = "qcom,sm8650-pcie-anoc", .data = &sm8650_pcie_anoc },
+       { .compatible = "qcom,sm8650-system-noc", .data = &sm8650_system_noc },
+       { }
+};
+MODULE_DEVICE_TABLE(of, qnoc_of_match);
+
+static struct platform_driver qnoc_driver = {
+       .probe = qcom_icc_rpmh_probe,
+       .remove_new = qcom_icc_rpmh_remove,
+       .driver = {
+               .name = "qnoc-sm8650",
+               .of_match_table = qnoc_of_match,
+               .sync_state = icc_sync_state,
+       },
+};
+
+static int __init qnoc_driver_init(void)
+{
+       return platform_driver_register(&qnoc_driver);
+}
+core_initcall(qnoc_driver_init);
+
+static void __exit qnoc_driver_exit(void)
+{
+       platform_driver_unregister(&qnoc_driver);
+}
+module_exit(qnoc_driver_exit);
+
+MODULE_DESCRIPTION("sm8650 NoC driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/interconnect/qcom/sm8650.h b/drivers/interconnect/qcom/sm8650.h
new file mode 100644 (file)
index 0000000..de35c95
--- /dev/null
@@ -0,0 +1,143 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/*
+ * SM8650 interconnect IDs
+ *
+ * Copyright (c) 2020-2021, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2023, Linaro Limited
+ */
+
+#ifndef __DRIVERS_INTERCONNECT_QCOM_SM8650_H
+#define __DRIVERS_INTERCONNECT_QCOM_SM8650_H
+
+#define SM8650_MASTER_A1NOC_SNOC               0
+#define SM8650_MASTER_A2NOC_SNOC               1
+#define SM8650_MASTER_ANOC_PCIE_GEM_NOC                2
+#define SM8650_MASTER_APPSS_PROC               3
+#define SM8650_MASTER_CAMNOC_HF                        4
+#define SM8650_MASTER_CAMNOC_ICP               5
+#define SM8650_MASTER_CAMNOC_SF                        6
+#define SM8650_MASTER_CDSP_HCP                 7
+#define SM8650_MASTER_CDSP_PROC                        8
+#define SM8650_MASTER_CNOC_CFG                 9
+#define SM8650_MASTER_CNOC_MNOC_CFG            10
+#define SM8650_MASTER_COMPUTE_NOC              11
+#define SM8650_MASTER_CRYPTO                   12
+#define SM8650_MASTER_GEM_NOC_CNOC             13
+#define SM8650_MASTER_GEM_NOC_PCIE_SNOC                14
+#define SM8650_MASTER_GFX3D                    15
+#define SM8650_MASTER_GIC                      16
+#define SM8650_MASTER_GPU_TCU                  17
+#define SM8650_MASTER_IPA                      18
+#define SM8650_MASTER_LLCC                     19
+#define SM8650_MASTER_LPASS_GEM_NOC            20
+#define SM8650_MASTER_LPASS_LPINOC             21
+#define SM8650_MASTER_LPASS_PROC               22
+#define SM8650_MASTER_LPIAON_NOC               23
+#define SM8650_MASTER_MDP                      24
+#define SM8650_MASTER_MNOC_HF_MEM_NOC          25
+#define SM8650_MASTER_MNOC_SF_MEM_NOC          26
+#define SM8650_MASTER_MSS_PROC                 27
+#define SM8650_MASTER_PCIE_0                   28
+#define SM8650_MASTER_PCIE_1                   29
+#define SM8650_MASTER_PCIE_ANOC_CFG            30
+#define SM8650_MASTER_QDSS_BAM                 31
+#define SM8650_MASTER_QDSS_ETR                 32
+#define SM8650_MASTER_QDSS_ETR_1               33
+#define SM8650_MASTER_QSPI_0                   34
+#define SM8650_MASTER_QUP_1                    35
+#define SM8650_MASTER_QUP_2                    36
+#define SM8650_MASTER_QUP_3                    37
+#define SM8650_MASTER_QUP_CORE_0               38
+#define SM8650_MASTER_QUP_CORE_1               39
+#define SM8650_MASTER_QUP_CORE_2               40
+#define SM8650_MASTER_SDCC_2                   41
+#define SM8650_MASTER_SDCC_4                   42
+#define SM8650_MASTER_SNOC_SF_MEM_NOC          43
+#define SM8650_MASTER_SP                       44
+#define SM8650_MASTER_SYS_TCU                  45
+#define SM8650_MASTER_UBWC_P                   46
+#define SM8650_MASTER_UBWC_P_TCU               47
+#define SM8650_MASTER_UFS_MEM                  48
+#define SM8650_MASTER_USB3_0                   49
+#define SM8650_MASTER_VIDEO                    50
+#define SM8650_MASTER_VIDEO_CV_PROC            51
+#define SM8650_MASTER_VIDEO_PROC               52
+#define SM8650_MASTER_VIDEO_V_PROC             53
+#define SM8650_SLAVE_A1NOC_SNOC                        54
+#define SM8650_SLAVE_A2NOC_SNOC                        55
+#define SM8650_SLAVE_AHB2PHY_NORTH             56
+#define SM8650_SLAVE_AHB2PHY_SOUTH             57
+#define SM8650_SLAVE_ANOC_PCIE_GEM_NOC         58
+#define SM8650_SLAVE_AOSS                      59
+#define SM8650_SLAVE_APPSS                     60
+#define SM8650_SLAVE_CAMERA_CFG                        61
+#define SM8650_SLAVE_CDSP_MEM_NOC              62
+#define SM8650_SLAVE_CLK_CTL                   63
+#define SM8650_SLAVE_CNOC_CFG                  64
+#define SM8650_SLAVE_CNOC_MNOC_CFG             65
+#define SM8650_SLAVE_CNOC_MSS                  66
+#define SM8650_SLAVE_CPR_HMX                   67
+#define SM8650_SLAVE_CPR_NSPCX                 68
+#define SM8650_SLAVE_CRYPTO_0_CFG              69
+#define SM8650_SLAVE_CX_RDPM                   70
+#define SM8650_SLAVE_DDRSS_CFG                 71
+#define SM8650_SLAVE_DISPLAY_CFG               72
+#define SM8650_SLAVE_EBI1                      73
+#define SM8650_SLAVE_GEM_NOC_CNOC              74
+#define SM8650_SLAVE_GFX3D_CFG                 75
+#define SM8650_SLAVE_I2C                       76
+#define SM8650_SLAVE_I3C_IBI0_CFG              77
+#define SM8650_SLAVE_I3C_IBI1_CFG              78
+#define SM8650_SLAVE_IMEM                      79
+#define SM8650_SLAVE_IMEM_CFG                  80
+#define SM8650_SLAVE_IPA_CFG                   81
+#define SM8650_SLAVE_IPC_ROUTER_CFG            82
+#define SM8650_SLAVE_LLCC                      83
+#define SM8650_SLAVE_LPASS_GEM_NOC             84
+#define SM8650_SLAVE_LPIAON_NOC_LPASS_AG_NOC   85
+#define SM8650_SLAVE_LPICX_NOC_LPIAON_NOC      86
+#define SM8650_SLAVE_MEM_NOC_PCIE_SNOC         87
+#define SM8650_SLAVE_MNOC_HF_MEM_NOC           88
+#define SM8650_SLAVE_MNOC_SF_MEM_NOC           89
+#define SM8650_SLAVE_MX_2_RDPM                 90
+#define SM8650_SLAVE_MX_RDPM                   91
+#define SM8650_SLAVE_NSP_QTB_CFG               92
+#define SM8650_SLAVE_PCIE_0                    93
+#define SM8650_SLAVE_PCIE_1                    94
+#define SM8650_SLAVE_PCIE_0_CFG                        95
+#define SM8650_SLAVE_PCIE_1_CFG                        96
+#define SM8650_SLAVE_PCIE_ANOC_CFG             97
+#define SM8650_SLAVE_PCIE_RSCC                 98
+#define SM8650_SLAVE_PDM                       99
+#define SM8650_SLAVE_PRNG                      100
+#define SM8650_SLAVE_QDSS_CFG                  101
+#define SM8650_SLAVE_QDSS_STM                  102
+#define SM8650_SLAVE_QSPI_0                    103
+#define SM8650_SLAVE_QUP_1                     104
+#define SM8650_SLAVE_QUP_2                     105
+#define SM8650_SLAVE_QUP_3                     106
+#define SM8650_SLAVE_QUP_CORE_0                        107
+#define SM8650_SLAVE_QUP_CORE_1                        108
+#define SM8650_SLAVE_QUP_CORE_2                        109
+#define SM8650_SLAVE_RBCPR_CX_CFG              110
+#define SM8650_SLAVE_RBCPR_MMCX_CFG            111
+#define SM8650_SLAVE_RBCPR_MXA_CFG             112
+#define SM8650_SLAVE_RBCPR_MXC_CFG             113
+#define SM8650_SLAVE_SDCC_2                    114
+#define SM8650_SLAVE_SDCC_4                    115
+#define SM8650_SLAVE_SERVICE_CNOC              116
+#define SM8650_SLAVE_SERVICE_CNOC_CFG          117
+#define SM8650_SLAVE_SERVICE_MNOC              118
+#define SM8650_SLAVE_SERVICE_PCIE_ANOC         119
+#define SM8650_SLAVE_SNOC_GEM_NOC_SF           120
+#define SM8650_SLAVE_SPSS_CFG                  121
+#define SM8650_SLAVE_TCSR                      122
+#define SM8650_SLAVE_TCU                       123
+#define SM8650_SLAVE_TLMM                      124
+#define SM8650_SLAVE_TME_CFG                   125
+#define SM8650_SLAVE_UFS_MEM_CFG               126
+#define SM8650_SLAVE_USB3_0                    127
+#define SM8650_SLAVE_VENUS_CFG                 128
+#define SM8650_SLAVE_VSENSE_CTRL_CFG           129
+
+#endif