Merge "ARM: dts: msm: Enable QoS settings for SDM855" into msm-4.14 (92b9bc8f) · Commits · e / devices / android_kernel_oneplus_sm8150

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

+37 −7

Original line number	Original line	Diff line number	Diff line
	@@ -366,7 +366,6 @@
	qcom,base-name = "aggre1_noc-base";		qcom,base-name = "aggre1_noc-base";
	qcom,qos-off = <4096>;		qcom,qos-off = <4096>;
	qcom,base-offset = <16384>;		qcom,base-offset = <16384>;
	qcom,bypass-qos-prg;
	qcom,bus-type = <1>;		qcom,bus-type = <1>;
	clocks = <>;		clocks = <>;
	};		};
	@@ -378,7 +377,6 @@
	qcom,base-name = "aggre2_noc-base";		qcom,base-name = "aggre2_noc-base";
	qcom,qos-off = <4096>;		qcom,qos-off = <4096>;
	qcom,base-offset = <24576>;		qcom,base-offset = <24576>;
	qcom,bypass-qos-prg;
	qcom,bus-type = <1>;		qcom,bus-type = <1>;
	clocks = <>;		clocks = <>;
	};		};
	@@ -401,7 +399,6 @@
	qcom,base-name = "compute_noc-base";		qcom,base-name = "compute_noc-base";
	qcom,qos-off = <8192>;		qcom,qos-off = <8192>;
	qcom,base-offset = <131072>;		qcom,base-offset = <131072>;
	qcom,bypass-qos-prg;
	qcom,bus-type = <1>;		qcom,bus-type = <1>;
	clocks = <>;		clocks = <>;
	};		};
	@@ -414,7 +411,6 @@
	qcom,qos-off = <0>;		qcom,qos-off = <0>;
	qcom,base-offset = <0>;		qcom,base-offset = <0>;
	qcom,sbm-offset = <24576>;		qcom,sbm-offset = <24576>;
	qcom,bypass-qos-prg;
	qcom,bus-type = <1>;		qcom,bus-type = <1>;
	clocks = <>;		clocks = <>;
	};		};
	@@ -438,7 +434,6 @@
	qcom,base-name = "gem_noc-base";		qcom,base-name = "gem_noc-base";
	qcom,qos-off = <128>;		qcom,qos-off = <128>;
	qcom,base-offset = <176128>;		qcom,base-offset = <176128>;
	qcom,bypass-qos-prg;
	qcom,bus-type = <1>;		qcom,bus-type = <1>;
	clocks = <>;		clocks = <>;
	};		};
	@@ -472,7 +467,6 @@
	qcom,base-name = "mmss_noc-base";		qcom,base-name = "mmss_noc-base";
	qcom,qos-off = <4096>;		qcom,qos-off = <4096>;
	qcom,base-offset = <36864>;		qcom,base-offset = <36864>;
	qcom,bypass-qos-prg;
	qcom,bus-type = <1>;		qcom,bus-type = <1>;
	clocks = <>;		clocks = <>;
	};		};
	@@ -484,7 +478,6 @@
	qcom,base-name = "system_noc-base";		qcom,base-name = "system_noc-base";
	qcom,qos-off = <4096>;		qcom,qos-off = <4096>;
	qcom,base-offset = <36864>;		qcom,base-offset = <36864>;
	qcom,bypass-qos-prg;
	qcom,bus-type = <1>;		qcom,bus-type = <1>;
	clocks = <>;		clocks = <>;
	};		};
	@@ -570,6 +563,12 @@
	qcom,bus-dev = <&fab_aggre1_noc>;		qcom,bus-dev = <&fab_aggre1_noc>;
	qcom,ap-owned;		qcom,ap-owned;
	qcom,prio = <2>;		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_xm_usb3_0: mas-xm-usb3-0 {		mas_xm_usb3_0: mas-xm-usb3-0 {
	@@ -582,6 +581,12 @@
	qcom,bus-dev = <&fab_aggre1_noc>;		qcom,bus-dev = <&fab_aggre1_noc>;
	qcom,ap-owned;		qcom,ap-owned;
	qcom,prio = <2>;		qcom,prio = <2>;
			qcom,node-qos-clks {
			clocks =
			<&clock_gcc GCC_AGGRE_USB3_PRIM_AXI_CLK>;
			clock-names =
			"clk-usb3-prim-axi-no-rate";
			};
	};		};

	mas_xm_usb3_1: mas-xm-usb3-1 {		mas_xm_usb3_1: mas-xm-usb3-1 {
	@@ -594,6 +599,12 @@
	qcom,bus-dev = <&fab_aggre1_noc>;		qcom,bus-dev = <&fab_aggre1_noc>;
	qcom,ap-owned;		qcom,ap-owned;
	qcom,prio = <2>;		qcom,prio = <2>;
			qcom,node-qos-clks {
			clocks =
			<&clock_gcc GCC_AGGRE_USB3_SEC_AXI_CLK>;
			clock-names =
			"clk-usb3-sec-axi-no-rate";
			};
	};		};

	mas_qhm_a2noc_cfg: mas-qhm-a2noc-cfg {		mas_qhm_a2noc_cfg: mas-qhm-a2noc-cfg {
	@@ -702,6 +713,8 @@
	qcom,ap-owned;		qcom,ap-owned;
	qcom,prio = <2>;		qcom,prio = <2>;
	qcom,forwarding;		qcom,forwarding;
			qcom,defer-init-qos;
			qcom,node-qos-bcms = <7035 0 1>;
	};		};

	mas_xm_pcie3_0: mas-xm-pcie3-0 {		mas_xm_pcie3_0: mas-xm-pcie3-0 {
	@@ -774,6 +787,12 @@
	qcom,bus-dev = <&fab_aggre2_noc>;		qcom,bus-dev = <&fab_aggre2_noc>;
	qcom,ap-owned;		qcom,ap-owned;
	qcom,prio = <2>;		qcom,prio = <2>;
			qcom,node-qos-clks {
			clocks =
			<&clock_gcc GCC_AGGRE_UFS_CARD_AXI_CLK>;
			clock-names =
			"clk-aggre-ufs-card-axi-no-rate";
			};
	};		};

	mas_qxm_camnoc_hf0_uncomp: mas-qxm-camnoc-hf0-uncomp {		mas_qxm_camnoc_hf0_uncomp: mas-qxm-camnoc-hf0-uncomp {
	@@ -999,6 +1018,7 @@
	qcom,bus-dev = <&fab_gem_noc>;		qcom,bus-dev = <&fab_gem_noc>;
	qcom,ap-owned;		qcom,ap-owned;
	qcom,prio = <0>;		qcom,prio = <0>;
			qcom,node-qos-bcms = <7012 0 1>;
	};		};

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

	mas_qnm_pcie: mas-qnm-pcie {		mas_qnm_pcie: mas-qnm-pcie {
	@@ -1106,6 +1127,7 @@
	qcom,ap-owned;		qcom,ap-owned;
	qcom,prio = <0>;		qcom,prio = <0>;
	qcom,forwarding;		qcom,forwarding;
			qcom,node-qos-bcms = <7012 0 1>;
	};		};

	mas_qxm_camnoc_hf1: mas-qxm-camnoc-hf1 {		mas_qxm_camnoc_hf1: mas-qxm-camnoc-hf1 {
	@@ -1120,6 +1142,7 @@
	qcom,ap-owned;		qcom,ap-owned;
	qcom,prio = <0>;		qcom,prio = <0>;
	qcom,forwarding;		qcom,forwarding;
			qcom,node-qos-bcms = <7012 0 1>;
	};		};

	mas_qxm_camnoc_sf: mas-qxm-camnoc-sf {		mas_qxm_camnoc_sf: mas-qxm-camnoc-sf {
	@@ -1134,6 +1157,7 @@
	qcom,ap-owned;		qcom,ap-owned;
	qcom,prio = <0>;		qcom,prio = <0>;
	qcom,forwarding;		qcom,forwarding;
			qcom,node-qos-bcms = <7012 0 1>;
	};		};

	mas_qxm_mdp0: mas-qxm-mdp0 {		mas_qxm_mdp0: mas-qxm-mdp0 {
	@@ -1148,6 +1172,7 @@
	qcom,ap-owned;		qcom,ap-owned;
	qcom,prio = <0>;		qcom,prio = <0>;
	qcom,forwarding;		qcom,forwarding;
			qcom,node-qos-bcms = <7012 0 1>;
	};		};

	mas_qxm_mdp1: mas-qxm-mdp1 {		mas_qxm_mdp1: mas-qxm-mdp1 {
	@@ -1162,6 +1187,7 @@
	qcom,ap-owned;		qcom,ap-owned;
	qcom,prio = <0>;		qcom,prio = <0>;
	qcom,forwarding;		qcom,forwarding;
			qcom,node-qos-bcms = <7012 0 1>;
	};		};

	mas_qxm_rot: mas-qxm-rot {		mas_qxm_rot: mas-qxm-rot {
	@@ -1176,6 +1202,7 @@
	qcom,ap-owned;		qcom,ap-owned;
	qcom,prio = <0>;		qcom,prio = <0>;
	qcom,forwarding;		qcom,forwarding;
			qcom,node-qos-bcms = <7012 0 1>;
	};		};

	mas_qxm_venus0: mas-qxm-venus0 {		mas_qxm_venus0: mas-qxm-venus0 {
	@@ -1190,6 +1217,7 @@
	qcom,ap-owned;		qcom,ap-owned;
	qcom,prio = <0>;		qcom,prio = <0>;
	qcom,forwarding;		qcom,forwarding;
			qcom,node-qos-bcms = <7012 0 1>;
	};		};

	mas_qxm_venus1: mas-qxm-venus1 {		mas_qxm_venus1: mas-qxm-venus1 {
	@@ -1204,6 +1232,7 @@
	qcom,ap-owned;		qcom,ap-owned;
	qcom,prio = <0>;		qcom,prio = <0>;
	qcom,forwarding;		qcom,forwarding;
			qcom,node-qos-bcms = <7012 0 1>;
	};		};

	mas_qxm_venus_arm9: mas-qxm-venus-arm9 {		mas_qxm_venus_arm9: mas-qxm-venus-arm9 {
	@@ -1218,6 +1247,7 @@
	qcom,ap-owned;		qcom,ap-owned;
	qcom,prio = <0>;		qcom,prio = <0>;
	qcom,forwarding;		qcom,forwarding;
			qcom,node-qos-bcms = <7012 0 1>;
	};		};

	mas_qhm_snoc_cfg: mas-qhm-snoc-cfg {		mas_qhm_snoc_cfg: mas-qhm-snoc-cfg {