Merge "ARM: dts: msm: Change display rsc to use AMC votes for sm6150" (71dd8c31) · Commits · e / devices / android_kernel_oneplus_sm8150

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

+21 −10

Original line number	Diff line number	Diff line
		@@ -47,7 +47,7 @@
		cell-id = <MSM_BUS_RSC_DISP>;
		label = "disp_rsc";
		qcom,rsc-dev;
		qcom,req_state = <3>;
		qcom,req_state = <2>;
		};

		/BCMs/
		@@ -179,6 +179,14 @@
		qcom,bcm-dev;
		};

		bcm_cn1: bcm-cn1 {
		cell-id = <MSM_BUS_BCM_CN1>;
		label = "CN1";
		qcom,bcm-name = "CN1";
		qcom,rscs = <&rsc_apps>;
		qcom,bcm-dev;
		};

		bcm_sn2: bcm-sn2 {
		cell-id = <MSM_BUS_BCM_SN2>;
		label = "SN2";
		@@ -483,6 +491,7 @@
		qcom,qport = <19>;
		qcom,connections = <&slv_qns_a1noc_snoc>;
		qcom,bus-dev = <&fab_aggre1_noc>;
		qcom,bcms = <&bcm_cn1>;
		qcom,ap-owned;
		qcom,prio = <2>;
		};
		@@ -599,6 +608,7 @@
		qcom,qport = <10>;
		qcom,connections = <&slv_qns_a1noc_snoc>;
		qcom,bus-dev = <&fab_aggre1_noc>;
		qcom,bcms = <&bcm_cn1>;
		qcom,ap-owned;
		qcom,prio = <2>;
		};
		@@ -611,6 +621,7 @@
		qcom,qport = <18>;
		qcom,connections = <&slv_qns_a1noc_snoc>;
		qcom,bus-dev = <&fab_aggre1_noc>;
		qcom,bcms = <&bcm_cn1>;
		qcom,ap-owned;
		qcom,prio = <2>;
		};
		@@ -910,7 +921,7 @@
		cell-id = <MSM_BUS_MASTER_LLCC>;
		label = "mas-llcc-mc";
		qcom,buswidth = <4>;
		qcom,agg-ports = <4>;
		qcom,agg-ports = <2>;
		qcom,connections = <&slv_ebi>;
		qcom,bus-dev = <&fab_mc_virt>;
		};
		@@ -1161,7 +1172,7 @@
		cell-id = <MSM_BUS_MASTER_LLCC_DISPLAY>;
		label = "mas-llcc-mc_display";
		qcom,buswidth = <4>;
		qcom,agg-ports = <4>;
		qcom,agg-ports = <2>;
		qcom,connections = <&slv_ebi_display>;
		qcom,bus-dev = <&fab_mc_virt_display>;
		};
		@@ -1253,7 +1264,7 @@
		qcom,buswidth = <4>;
		qcom,agg-ports = <1>;
		qcom,bus-dev = <&fab_config_noc>;
		qcom,bcms = <&bcm_cn0>;
		qcom,bcms = <&bcm_cn1>;
		};

		slv_qhs_ahb2phy_west:slv-qhs-ahb2phy-west {
		@@ -1262,7 +1273,7 @@
		qcom,buswidth = <4>;
		qcom,agg-ports = <1>;
		qcom,bus-dev = <&fab_config_noc>;
		qcom,bcms = <&bcm_cn0>;
		qcom,bcms = <&bcm_cn1>;
		};

		slv_qhs_aop:slv-qhs-aop {
		@@ -1444,7 +1455,7 @@
		qcom,buswidth = <4>;
		qcom,agg-ports = <1>;
		qcom,bus-dev = <&fab_config_noc>;
		qcom,bcms = <&bcm_cn0>;
		qcom,bcms = <&bcm_cn1>;
		};

		slv_qhs_qup0:slv-qhs-qup0 {
		@@ -1471,7 +1482,7 @@
		qcom,buswidth = <4>;
		qcom,agg-ports = <1>;
		qcom,bus-dev = <&fab_config_noc>;
		qcom,bcms = <&bcm_cn0>;
		qcom,bcms = <&bcm_cn1>;
		};

		slv_qhs_sdc2:slv-qhs-sdc2 {
		@@ -1480,7 +1491,7 @@
		qcom,buswidth = <4>;
		qcom,agg-ports = <1>;
		qcom,bus-dev = <&fab_config_noc>;
		qcom,bcms = <&bcm_cn0>;
		qcom,bcms = <&bcm_cn1>;
		};

		slv_qhs_snoc_cfg:slv-qhs-snoc-cfg {
		@@ -1677,7 +1688,7 @@
		cell-id = <MSM_BUS_SLAVE_EBI_CH0>;
		label = "slv-ebi";
		qcom,buswidth = <4>;
		qcom,agg-ports = <4>;
		qcom,agg-ports = <2>;
		qcom,bus-dev = <&fab_mc_virt>;
		qcom,bcms = <&bcm_mc0>, <&bcm_acv>;
		};
		@@ -1814,7 +1825,7 @@
		cell-id = <MSM_BUS_SLAVE_EBI_CH0_DISPLAY>;
		label = "slv-ebi_display";
		qcom,buswidth = <4>;
		qcom,agg-ports = <4>;
		qcom,agg-ports = <2>;
		qcom,bus-dev = <&fab_mc_virt_display>;
		qcom,bcms = <&bcm_mc0_display>;
		};

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

+7 −6

Original line number	Diff line number	Diff line
		@@ -89,12 +89,13 @@
		#define MSM_BUS_BCM_CE0 7034
		#define MSM_BUS_BCM_IP0 7035
		#define MSM_BUS_BCM_CN0 7036
		#define MSM_BUS_BCM_ACV 7037
		#define MSM_BUS_BCM_ALC 7038
		#define MSM_BUS_BCM_QUP0 7039
		#define MSM_BUS_BCM_CO0 7040
		#define MSM_BUS_BCM_CO1 7041
		#define MSM_BUS_BCM_CO2 7042
		#define MSM_BUS_BCM_CN1 7037
		#define MSM_BUS_BCM_ACV 7038
		#define MSM_BUS_BCM_ALC 7039
		#define MSM_BUS_BCM_QUP0 7040
		#define MSM_BUS_BCM_CO0 7041
		#define MSM_BUS_BCM_CO1 7042
		#define MSM_BUS_BCM_CO2 7043

		#define MSM_BUS_RSC_APPS 8000
		#define MSM_BUS_RSC_DISP 8001