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

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

Merge "Merge remote-tracking branch 'origin/dev/msm-4.14-display' into k_414"

parents 7cf0ae15 5aab6d4f

Documentation/devicetree/bindings/drm/msm/mdss-dsi-panel.txt

+2 −2
Original line number Diff line number Diff line
@@ -640,8 +640,6 @@ Example: 
		qcom,mdss-dsi-mdp-trigger = <0>;

		qcom,mdss-dsi-dma-trigger = <0>;

		qcom,mdss-dsi-panel-framerate = <60>;

		qcom,mdss-dsi-panel-clockrate = <424000000>;

		qcom,mdss-mdp-transfer-time-us = <12500>;

		qcom,mdss-dsi-panel-timings = [7d 25 1d 00 37 33

					22 27 1e 03 04 00];

                qcom,mdss-dsi-panel-timings-8996 = [23 20 06 09 05 03 04 a0
@@ -719,6 +717,8 @@ Example: 
				qcom,mdss-dsi-v-front-porch = <728>;

				qcom,mdss-dsi-v-pulse-width = <4>;

				qcom,mdss-dsi-panel-framerate = <60>;

				qcom,mdss-dsi-panel-clockrate = <424000000>;

				qcom,mdss-mdp-transfer-time-us = <12500>;

				qcom,mdss-dsi-panel-timings = [E6 38 26 00 68 6E 2A 3C 2C 03 04 00];

				qcom,mdss-dsi-t-clk-post = <0x02>;

				qcom,mdss-dsi-t-clk-pre = <0x2a>;

arch/arm64/boot/dts/qcom/dsi-panel-td4328-1080p-cmd.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ 
				qcom,mdss-dsi-v-front-porch = <5>;

				qcom,mdss-dsi-v-pulse-width = <2>;

				qcom,mdss-dsi-panel-framerate = <60>;

				qcom,mdss-dsi-panel-jitter = <0x4 0x1>;

				qcom,mdss-dsi-on-command = [

					29 01 00 00 00 00 02 B0 00

					29 01 00 00 00 00 04 B3 00 00 06

arch/arm64/boot/dts/qcom/sm6150-sde-display.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -307,6 +307,7 @@ 
				24 20 08 09 05 02 04 a0

				24 1d 08 09 05 02 04 a0];



			qcom,mdss-mdp-transfer-time-us = <14500>;

			qcom,display-topology = <1 0 1>;

			qcom,default-topology-index = <0>;

			qcom,partial-update-enabled = "single_roi";

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

+0 −16
Original line number Diff line number Diff line
@@ -37,8 +37,6 @@ 
		clock-max-rate = <0 0 0 307000000 19200000 307000000>;

		qcom,dss-cx-ipeak = <&cx_ipeak_lm 3>;



		sde-vdd-supply = <&mdss_core_gdsc>;



		/* interrupt config */

		interrupts = <0 83 0>;

		interrupt-controller;
@@ -211,20 +209,6 @@ 
			qcom,sde-dspp-dither = <0x82c 0x00010007>;

		};



		qcom,platform-supply-entries {

			#address-cells = <1>;

			#size-cells = <0>;



			qcom,platform-supply-entry@0 {

				reg = <0>;

				qcom,supply-name = "sde-vdd";

				qcom,supply-min-voltage = <0>;

				qcom,supply-max-voltage = <0>;

				qcom,supply-enable-load = <0>;

				qcom,supply-disable-load = <0>;

			};

		};



		smmu_sde_sec: qcom,smmu_sde_sec_cb {

			compatible = "qcom,smmu_sde_sec";

			iommus = <&apps_smmu 0x801 0x0>;

arch/arm64/boot/dts/qcom/sm8150-sde-display.dtsi

+0 −2
Original line number Diff line number Diff line
@@ -494,8 +494,6 @@ 
	qcom,ext-disp = <&ext_disp>;

	qcom,dp-aux-switch = <&fsa4480>;



	qcom,aux-en-gpio = <&tlmm 43 0>;

	qcom,aux-sel-gpio = <&tlmm 51 0>;

	qcom,usbplug-cc-gpio = <&tlmm 38 0>;



	pinctrl-names = "mdss_dp_active", "mdss_dp_sleep";