From 1a9b237caa9c51ccb96aa27c18c64d3b41b6515c Mon Sep 17 00:00:00 2001 From: Odelu Kukatla Date: Sat, 1 Aug 2020 20:16:04 +0530 Subject: [PATCH 1/2] icc: dt-bindings: Add USB3 master ID for Holi Add USB3 master ID for Holi so that client can vote for bandwidth. Change-Id: Ied8597df5bb86989657d8493816c4a882b898b3f Signed-off-by: Odelu Kukatla --- include/dt-bindings/interconnect/qcom,holi.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/dt-bindings/interconnect/qcom,holi.h b/include/dt-bindings/interconnect/qcom,holi.h index c6c5011f9bfd..7f203005b3b4 100644 --- a/include/dt-bindings/interconnect/qcom,holi.h +++ b/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 From bfc522e8148bc9b238e62f585aac9795dd031bfe Mon Sep 17 00:00:00 2001 From: Odelu Kukatla Date: Sat, 1 Aug 2020 20:22:09 +0530 Subject: [PATCH 2/2] interconnect: qcom: Add USB3 master for Holi Add USB3 master so that client can vote for bandwidth on Holi. Change-Id: I37661eda4febdff619a703f423aca957f91347b5 Signed-off-by: Odelu Kukatla --- drivers/interconnect/qcom/Makefile | 2 +- drivers/interconnect/qcom/holi.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/drivers/interconnect/qcom/Makefile b/drivers/interconnect/qcom/Makefile index d26aabfd8a8d..d96dfca7e24f 100644 --- a/drivers/interconnect/qcom/Makefile +++ b/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 diff --git a/drivers/interconnect/qcom/holi.c b/drivers/interconnect/qcom/holi.c index 6e3b322cfdaa..e0339b58eac7 100644 --- a/drivers/interconnect/qcom/holi.c +++ b/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,