Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c3fad735 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Add virtual bus node for GPU master for TRINKET"

parents 0cdb7451 c462c4c8

arch/arm64/boot/dts/qcom/trinket-bus.dtsi

+26 −8
Original line number Diff line number Diff line
@@ -19,9 +19,10 @@ 
		reg = <0x1880000 0x60200>,

			<0x4480000 0x80000>,

			<0x1900000 0x8200>,

			<0x1880000 0x60200>,

			<0x1880000 0x60200>;

		reg-names = "sys_noc-base", "bimc-base", "config_noc-base",

				"qup_virt-base";

				"qup_virt-base", "fab-gpu_vert-base";



		/*Buses*/
@@ -74,6 +75,15 @@ 
				<&clock_rpmcc SNOC_MSMBUS_A_CLK>;

		};



		fab_gpu_vert: fab-gpu_vert {

			cell-id = <MSM_BUS_FAB_GPU_VIRT>;

			label = "fab-gpu_vert";

			qcom,vert-dev;

			qcom,base-name = "fab-gpu_vert-base";

			qcom,bypass-qos-prg;

			qcom,bus-type = <3>;

		};



		/*Masters*/



		mas_apps_proc: mas-apps-proc {
@@ -551,18 +561,27 @@ 
			qcom,mas-rpm-id = <ICBID_MASTER_USB3_0>;

		};



		mas_qnm_gpu_qos: mas-qnm-gpu-qos {

			cell-id = <MSM_BUS_MASTER_GRAPHICS_3D_PORT1>;

			label = "mas-qnm-gpu-qos";

			qcom,buswidth = <32>;

			qcom,agg-ports = <1>;

			qcom,ap-owned;

			qcom,qport = <16>;

			qcom,qos-mode = "fixed";

			qcom,bus-dev = <&fab_sys_noc>;

			qcom,prio = <0>;

			qcom,mas-rpm-id = <ICBID_MASTER_GFX3D>;

		};



		mas_qnm_gpu: mas-qnm-gpu {

			cell-id = <MSM_BUS_MASTER_GRAPHICS_3D>;

			label = "mas-qnm-gpu";

			qcom,buswidth = <32>;

			qcom,agg-ports = <1>;

			qcom,ap-owned;

			qcom,qport = <16>;

			qcom,qos-mode = "fixed";

			qcom,connections = <&slv_gpu_cdsp_bimc>;

			qcom,prio = <0>;

			qcom,util-fact = <153>;

			qcom,bus-dev = <&fab_sys_noc>;

			qcom,bus-dev = <&fab_gpu_vert>;

			qcom,mas-rpm-id = <ICBID_MASTER_GFX3D>;



		};
@@ -1082,8 +1101,7 @@ 
			label = "slv-gpu-cdsp-bimc";

			qcom,buswidth = <32>;

			qcom,agg-ports = <1>;

			qcom,util-fact = <153>;

			qcom,bus-dev = <&fab_sys_noc>;

			qcom,bus-dev = <&fab_gpu_vert>;

			qcom,connections = <&mas_gpu_cdsp_bimc>;

			qcom,slv-rpm-id = <ICBID_SLAVE_GPU_CDSP_BIMC>;

		};

include/dt-bindings/msm/msm-bus-ids.h

+2 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2014-2018, The Linux Foundation. All rights reserved.

/* Copyright (c) 2014-2019, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -47,6 +47,7 @@ 
#define	MSM_BUS_FAB_COMP_NOC 6155

#define	MSM_BUS_FAB_GEM_NOC 6156

#define	MSM_BUS_FAB_QUP_VIRT 6157

#define	MSM_BUS_FAB_GPU_VIRT 6158



#define	MSM_BUS_FAB_MC_VIRT_DISPLAY 26000

#define	MSM_BUS_FAB_MEM_NOC_DISPLAY 26001