Merge "interconnect: qcom: Add USB3 master for Holi"

drivers/interconnect/qcom/Makefile

@@ -9,7 +9,7 @@ qnoc-shima-objs				:= shima.o
 icc-smd-rpm-objs			:= smd-rpm.o
 icc-bcm-voter-objs			:= bcm-voter.o
 icc-rpmh-obj				:= icc-rpmh.o
-icc-rpm-objs			:= icc-rpm.o
+icc-rpm-obj			:= icc-rpm.o
 
 obj-$(CONFIG_INTERCONNECT_QCOM_HOLI) += qnoc-holi.o
 obj-$(CONFIG_INTERCONNECT_QCOM_QCS404) += qnoc-qcs404.o

drivers/interconnect/qcom/holi.c

@@ -375,6 +375,17 @@ static struct qcom_icc_node xm_ufs_mem = {
 	.links = { A1NOC_SNOC_SLV },
 };
 
+static struct qcom_icc_node xm_usb3_0 = {
+	.name = "xm_usb3_0",
+	.id = MASTER_USB3_0,
+	.channels = 1,
+	.buswidth = 8,
+	.mas_rpm_id = -1,
+	.slv_rpm_id = -1,
+	.num_links = 1,
+	.links = { A1NOC_SNOC_SLV },
+};
+
 static struct qcom_icc_node mas_crypto_c0 = {
 	.name = "mas_crypto_c0",
 	.id = MASTER_CRYPTO_CORE0,
@@ -1127,6 +1138,7 @@ static struct qcom_icc_node *sys_noc_nodes[] = {
 	[MASTER_QDSS_BAM] = &qhm_qdss_bam,
 	[MASTER_IPA] = &qxm_ipa,
 	[MASTER_QDSS_ETR] = &xm_qdss_etr,
+	[MASTER_USB3_0] = &xm_usb3_0,
 	[SLAVE_APPSS] = &qhs_apss,
 	[SNOC_CNOC_SLV] = &slv_snoc_cnoc,
 	[SLAVE_OCIMEM] = &qxs_imem,

include/dt-bindings/interconnect/qcom,holi.h

@@ -37,6 +37,7 @@
 #define MASTER_QDSS_BAM				28
 #define MASTER_IPA				29
 #define MASTER_QDSS_ETR				30
+#define MASTER_USB3_0				31
 
 #define SLAVE_EBI				512
 #define BIMC_SNOC_SLV				513