Merge "interconnect: qcom: yupik: Enable the QoS for GIC port" (9aace5e3) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/interconnect/qcom/yupik.c

+22 −0

Original line number	Diff line number	Diff line
		@@ -849,6 +849,27 @@ static struct qcom_icc_node qxm_nsp = {
		.links = { SLAVE_CDSP_MEM_NOC },
		};

		static struct qcom_icc_qosbox qhm_gic_qos = {
		.regs = icc_qnoc_qos_regs[ICC_QNOC_QOSGEN_TYPE_RPMH],
		.num_ports = 1,
		.offsets = { 0x9000 },
		.config = &(struct qos_config) {
		.prio = 2,
		.urg_fwd = 0,
		},
		};

		static struct qcom_icc_node qhm_gic = {
		.name = "qhm_gic",
		.id = MASTER_GIC_1,
		.channels = 1,
		.buswidth = 4,
		.noc_ops = &qcom_qnoc4_ops,
		.qosbox = &qhm_gic_qos,
		.num_links = 1,
		.links = { SLAVE_SNOC_GEM_NOC_SF },
		};

		static struct qcom_icc_node qnm_aggre1_noc = {
		.name = "qnm_aggre1_noc",
		.id = MASTER_A1NOC_SNOC,
		@@ -2437,6 +2458,7 @@ static struct qcom_icc_bcm *system_noc_bcms[] = {
		};

		static struct qcom_icc_node *system_noc_nodes[] = {
		[MASTER_GIC_1] = &qhm_gic,
		[MASTER_A1NOC_SNOC] = &qnm_aggre1_noc,
		[MASTER_A2NOC_SNOC] = &qnm_aggre2_noc,
		[MASTER_SNOC_CFG] = &qnm_snoc_cfg,

+2 −1

Original line number	Diff line number	Diff line
		/* SPDX-License-Identifier: GPL-2.0-only */
		/*
		* Copyright (c) 2020, The Linux Foundation. All rights reserved.
		* Copyright (c) 2020-2021, The Linux Foundation. All rights reserved.
		*/

		#ifndef __DT_BINDINGS_INTERCONNECT_QCOM_YUPIK_H
		@@ -58,6 +58,7 @@
		#define MASTER_SDCC_4 49
		#define MASTER_UFS_MEM 50
		#define MASTER_USB3_0 51
		#define MASTER_GIC_1 52
		#define SLAVE_EBI1 512
		#define SLAVE_AHB2PHY_SOUTH 513
		#define SLAVE_AHB2PHY_NORTH 514