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

Commit 1708fcc6 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: add sde block lengths on msm8996"

parents 726c5731 70631c06
Loading
Loading
Loading
Loading
+10 −0
Original line number Diff line number Diff line
@@ -57,15 +57,21 @@

		/* hw blocks */
		qcom,sde-off = <0x1000>;
		qcom,sde-len = <0x450>;
		qcom,sde-ctl-off = <0x2000 0x2200 0x2400
				     0x2600 0x2800>;
		qcom,sde-ctl-size = <0x60>;
		qcom,sde-ctl-display-pref = "primary", "secondary", "none",
				    "none", "none";

		qcom,sde-mixer-off = <0x45000 0x46000 0x47000
				      0x48000 0x49000 0x4a000>;
		qcom,sde-mixer-size = <0x3c0>;
		qcom,sde-mixer-display-pref = "primary", "secondary", "none",
				      "none", "none";

		qcom,sde-dspp-off = <0x55000 0x57000>;
		qcom,sde-dspp-size = <0x17c0>;
		qcom,sde-dspp-ad-off = <0x24000 0x22800>;
		qcom,sde-dspp-ad-version = <0x00030000>;
		qcom,sde-wb-off = <0x66000>;
@@ -74,12 +80,15 @@
		qcom,sde-wb-clk-ctrl = <0x2bc 16>;
		qcom,sde-intf-off = <0x6b000 0x6b800
					0x6c000 0x6c800>;
		qcom,sde-intf-size = <0x260>;
		qcom,sde-intf-type = "none", "dsi", "dsi", "hdmi";
		qcom,sde-pp-off = <0x71000 0x71800
					  0x72000 0x72800 0x73000>;
		qcom,sde-pp-size = <0xc8>;
		qcom,sde-pp-slave = <0x0 0x0 0x0 0x0 0x1>;
		qcom,sde-te2-off = <0x2000 0x2000 0x0 0x0 0x0>;
		qcom,sde-cdm-off = <0x7a200>;
		qcom,sde-cdm-size = <0x200>;
		qcom,sde-dsc-off = <0x10000 0x10000 0x0 0x0 0x0>;
		qcom,sde-intf-max-prefetch-lines = <0x15 0x15 0x15 0x15>;

@@ -92,6 +101,7 @@
				      0xb000 0x15000 0x17000
				      0x19000 0x1b000 0x25000
				      0x27000 0x35000 0x37000>;
		qcom,sde-sspp-src-size = <0x138>;

		qcom,sde-sspp-xin-id = <0 4 8
					12 1 5