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

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

Merge "ARM: dts: msm: Enable QoS programming for SDMMAGPIE"

parents aff96459 14b9c916
Loading
Loading
Loading
Loading
+59 −14
Original line number Diff line number Diff line
@@ -335,7 +335,6 @@
			qcom,qos-off = <4096>;
			qcom,base-offset = <16384>;
			qcom,sbm-offset = <0>;
			qcom,bypass-qos-prg;
			qcom,bus-type = <1>;
			clocks = <>;
		};
@@ -348,7 +347,6 @@
			qcom,qos-off = <4096>;
			qcom,base-offset = <20480>;
			qcom,sbm-offset = <0>;
			qcom,bypass-qos-prg;
			qcom,bus-type = <1>;
			clocks = <>;
		};
@@ -370,8 +368,8 @@
			label = "fab-compute_noc";
			qcom,fab-dev;
			qcom,base-name = "compute_noc-base";
			qcom,qos-off = <12288>;
			qcom,base-offset = <49152>;
			qcom,qos-off = <4096>;
			qcom,base-offset = <0>;
			qcom,sbm-offset = <0>;
			qcom,bypass-qos-prg;
			qcom,bus-type = <1>;
@@ -412,7 +410,6 @@
			qcom,qos-off = <128>;
			qcom,base-offset = <176128>;
			qcom,sbm-offset = <0>;
			qcom,bypass-qos-prg;
			qcom,bus-type = <1>;
			clocks = <>;
		};
@@ -449,7 +446,6 @@
			qcom,qos-off = <128>;
			qcom,base-offset = <36864>;
			qcom,sbm-offset = <0>;
			qcom,bypass-qos-prg;
			qcom,bus-type = <1>;
			clocks = <>;
		};
@@ -462,7 +458,6 @@
			qcom,qos-off = <4096>;
			qcom,base-offset = <40960>;
			qcom,sbm-offset = <0>;
			qcom,bypass-qos-prg;
			qcom,bus-type = <1>;
			clocks = <>;
		};
@@ -548,7 +543,7 @@
			qcom,bus-dev = <&fab_aggre1_noc>;
			qcom,bcms = <&bcm_cn0>;
			qcom,ap-owned;
			qcom,prio = <0>;
			qcom,prio = <2>;
		};

		mas_xm_sdc2: mas-xm-sdc2 {
@@ -561,7 +556,7 @@
			qcom,bus-dev = <&fab_aggre1_noc>;
			qcom,bcms = <&bcm_cn0>;
			qcom,ap-owned;
			qcom,prio = <1>;
			qcom,prio = <2>;
		};

		mas_xm_sdc4: mas-xm-sdc4 {
@@ -574,7 +569,7 @@
			qcom,bus-dev = <&fab_aggre1_noc>;
			qcom,bcms = <&bcm_cn0>;
			qcom,ap-owned;
			qcom,prio = <1>;
			qcom,prio = <2>;
		};

		mas_xm_ufs_mem: mas-xm-ufs-mem {
@@ -587,6 +582,12 @@
			qcom,bus-dev = <&fab_aggre1_noc>;
			qcom,ap-owned;
			qcom,prio = <2>;
			qcom,node-qos-clks {
				clocks =
				<&clock_gcc GCC_AGGRE_UFS_PHY_AXI_CLK>;
				clock-names =
				"clk-aggre-ufs-phy-axi-no-rate";
			};
		};

		mas_qhm_a2noc_cfg: mas-qhm-a2noc-cfg {
@@ -632,7 +633,8 @@
			qcom,connections = <&slv_qns_a2noc_snoc>;
			qcom,bus-dev = <&fab_aggre2_noc>;
			qcom,ap-owned;
			qcom,prio = <1>;
			qcom,prio = <2>;
			qcom,forwarding;
		};

		mas_qxm_crypto: mas-qxm-crypto {
@@ -646,6 +648,7 @@
			qcom,bcms = <&bcm_ce0>;
			qcom,ap-owned;
			qcom,prio = <2>;
			qcom,forwarding;
		};

		mas_qxm_ipa: mas-qxm-ipa {
@@ -658,6 +661,9 @@
			qcom,bus-dev = <&fab_aggre2_noc>;
			qcom,ap-owned;
			qcom,prio = <2>;
			qcom,forwarding;
			qcom,defer-init-qos;
			qcom,node-qos-bcms = <7035 0 1>;
		};

		mas_xm_pcie3_0: mas-xm-pcie3-0 {
@@ -669,7 +675,7 @@
			qcom,connections = <&slv_qns_pcie_gemnoc>;
			qcom,bus-dev = <&fab_aggre2_noc>;
			qcom,ap-owned;
			qcom,prio = <0>;
			qcom,prio = <2>;
		};

		mas_xm_qdss_etr: mas-xm-qdss-etr {
@@ -694,6 +700,12 @@
			qcom,bus-dev = <&fab_aggre2_noc>;
			qcom,ap-owned;
			qcom,prio = <2>;
			qcom,node-qos-clks {
				clocks =
				<&clock_gcc GCC_AGGRE_USB3_PRIM_AXI_CLK>;
				clock-names =
				"clk-aggre-usb3-prim-axi-no-rate";
			};
		};

		mas_qxm_camnoc_hf0_uncomp: mas-qxm-camnoc-hf0-uncomp {
@@ -842,10 +854,14 @@
			label = "mas-acm-apps";
			qcom,buswidth = <16>;
			qcom,agg-ports = <1>;
			qcom,qport = <96 98>;
			qcom,connections = <&slv_qns_llcc
				&slv_qns_gem_noc_snoc>;
			qcom,bus-dev = <&fab_gem_noc>;
			qcom,bcms = <&bcm_sh5>;
			qcom,ap-owned;
			qcom,prio = <0>;
			qcom,forwarding;
		};

		mas_acm_sys_tcu: mas-acm-sys-tcu {
@@ -895,6 +911,8 @@
			qcom,bus-dev = <&fab_gem_noc>;
			qcom,ap-owned;
			qcom,prio = <0>;
			qcom,forwarding;
			qcom,node-qos-bcms = <7012 0 1>;
		};

		mas_qnm_mnoc_sf: mas-qnm-mnoc-sf {
@@ -908,6 +926,8 @@
			qcom,bus-dev = <&fab_gem_noc>;
			qcom,ap-owned;
			qcom,prio = <0>;
			qcom,forwarding;
			qcom,node-qos-bcms = <7012 0 1>;
		};

		mas_qnm_pcie: mas-qnm-pcie {
@@ -920,7 +940,7 @@
				&slv_qns_gem_noc_snoc>;
			qcom,bus-dev = <&fab_gem_noc>;
			qcom,ap-owned;
			qcom,prio = <0>;
			qcom,prio = <2>;
		};

		mas_qnm_snoc_gc: mas-qnm-snoc-gc {
@@ -933,6 +953,7 @@
			qcom,bus-dev = <&fab_gem_noc>;
			qcom,ap-owned;
			qcom,prio = <0>;
			qcom,forwarding;
		};

		mas_qnm_snoc_sf: mas-qnm-snoc-sf {
@@ -945,6 +966,7 @@
			qcom,bus-dev = <&fab_gem_noc>;
			qcom,ap-owned;
			qcom,prio = <0>;
			qcom,forwarding;
		};

		mas_qxm_gpu: mas-qxm-gpu {
@@ -958,6 +980,7 @@
			qcom,bus-dev = <&fab_gem_noc>;
			qcom,ap-owned;
			qcom,prio = <0>;
			qcom,forwarding;
		};

		mas_ipa_core_master: mas-ipa-core-master {
@@ -998,6 +1021,8 @@
			qcom,bcms = <&bcm_mm1>;
			qcom,ap-owned;
			qcom,prio = <0>;
			qcom,forwarding;
			qcom,node-qos-bcms = <7012 0 1>;
		};

		mas_qxm_camnoc_nrt: mas-qxm-camnoc-nrt {
@@ -1011,6 +1036,8 @@
			qcom,bcms = <&bcm_mm2>;
			qcom,ap-owned;
			qcom,prio = <0>;
			qcom,forwarding;
			qcom,node-qos-bcms = <7012 0 1>;
		};

		mas_qxm_camnoc_rt: mas-qxm-camnoc-rt {
@@ -1024,6 +1051,8 @@
			qcom,bcms = <&bcm_mm1>;
			qcom,ap-owned;
			qcom,prio = <0>;
			qcom,forwarding;
			qcom,node-qos-bcms = <7012 0 1>;
		};

		mas_qxm_camnoc_sf: mas-qxm-camnoc-sf {
@@ -1037,6 +1066,8 @@
			qcom,bcms = <&bcm_mm3>;
			qcom,ap-owned;
			qcom,prio = <0>;
			qcom,forwarding;
			qcom,node-qos-bcms = <7012 0 1>;
		};

		mas_qxm_mdp0: mas-qxm-mdp0 {
@@ -1050,6 +1081,8 @@
			qcom,bcms = <&bcm_mm1>;
			qcom,ap-owned;
			qcom,prio = <0>;
			qcom,forwarding;
			qcom,node-qos-bcms = <7012 0 1>;
		};

		mas_qxm_mdp1: mas-qxm-mdp1 {
@@ -1063,6 +1096,8 @@
			qcom,bcms = <&bcm_mm1>;
			qcom,ap-owned;
			qcom,prio = <0>;
			qcom,forwarding;
			qcom,node-qos-bcms = <7012 0 1>;
		};

		mas_qxm_rot: mas-qxm-rot {
@@ -1076,6 +1111,8 @@
			qcom,bcms = <&bcm_mm3>;
			qcom,ap-owned;
			qcom,prio = <0>;
			qcom,forwarding;
			qcom,node-qos-bcms = <7012 0 1>;
		};

		mas_qxm_venus0: mas-qxm-venus0 {
@@ -1089,6 +1126,8 @@
			qcom,bcms = <&bcm_mm3>;
			qcom,ap-owned;
			qcom,prio = <0>;
			qcom,forwarding;
			qcom,node-qos-bcms = <7012 0 1>;
		};

		mas_qxm_venus1: mas-qxm-venus1 {
@@ -1102,6 +1141,8 @@
			qcom,bcms = <&bcm_mm3>;
			qcom,ap-owned;
			qcom,prio = <0>;
			qcom,forwarding;
			qcom,node-qos-bcms = <7012 0 1>;
		};

		mas_qxm_venus_arm9: mas-qxm-venus-arm9 {
@@ -1115,6 +1156,8 @@
			qcom,bcms = <&bcm_mm3>;
			qcom,ap-owned;
			qcom,prio = <0>;
			qcom,forwarding;
			qcom,node-qos-bcms = <7012 0 1>;
		};

		mas_qhm_snoc_cfg: mas-qhm-snoc-cfg {
@@ -1175,6 +1218,7 @@
			qcom,bcms = <&bcm_sn12>;
			qcom,ap-owned;
			qcom,prio = <2>;
			qcom,forwarding;
		};

		mas_xm_gic: mas-xm-gic {
@@ -1187,7 +1231,8 @@
			qcom,bus-dev = <&fab_system_noc>;
			qcom,bcms = <&bcm_sn12>;
			qcom,ap-owned;
			qcom,prio = <1>;
			qcom,prio = <2>;
			qcom,forwarding;
		};

		mas_alc: mas-alc {