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

Commit 4fe15472 authored by Yuan Zhao's avatar Yuan Zhao Committed by Gerrit - the friendly Code Review server
Browse files

ARM: dts: msm: set 60hz cmd mode as default mode for qrd lahaina

Set 60hz cmd mode as default display panel mode, and
enable ESD check for cmd mode. Changed the PHY timing
settings according to the new PHY timing excel version.

Change-Id: Ib026bb19595a7f30bc7b2a36ac5eeb02749b043e
parent 33e04644
Loading
Loading
Loading
Loading
+47 −45
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@
		qcom,mdss-dsi-te-using-te-pin;
		qcom,mdss-dsi-display-timings {
			timing@0 {
				qcom,mdss-dsi-panel-framerate = <120>;
				qcom,mdss-dsi-panel-framerate = <60>;
				qcom,mdss-dsi-panel-width = <1080>;
				qcom,mdss-dsi-panel-height = <2340>;
				qcom,mdss-dsi-h-front-porch = <95>;
@@ -56,52 +56,23 @@
				qcom,mdss-dsi-timing-switch-command = [
					39 01 00 00 00 00 02 b0 00
					39 01 00 00 00 00 1a c2 09 24 0c 00 00
					   0c 00 00 00 09 3c 00 00 00 00 00 00
					   0c 09 3c 00 09 3c 00 00 00 00 00 00
					   00 00 00 00 00 30 00 6c
				];

				qcom,mdss-dsi-on-command = [
					39 01 00 00 00 00 02 b0 00
					39 01 00 00 00 00 0c c2 09 24 0c 00 00
					   0c 00 00 00 09 3c
					39 01 00 00 00 00 1a d7 00 b9 3c 00 40
					   04 00 a0 0a 00 40 00 00 00 00 00 00
					   19 3c 00 40 04 00 a0 0a
					39 01 00 00 00 00 13 d8 00 00 00 00 00
					   00 00 00 00 5b 00 5b 00 5b 00 5b 00
					   5b
					39 01 00 00 00 00 02 b0 80
					39 01 00 00 00 00 14 de 40 00 18 00 18
					   00 18 00 18 10 00 18 00 18 00 18 02
					   00 00
					39 01 00 00 00 00 02 b0 04
					39 01 00 00 00 00 03 e8 00 02
					39 01 00 00 00 00 03 e4 00 08
					39 01 00 00 00 00 02 e6 00
					39 01 00 00 00 00 02 b0 00
					39 01 00 00 00 00 11 c4 00 00 00 00
					   00 00 00 00 00 00 00 02 00 00 00 32
					39 01 00 00 00 00 19 cf 64 0b 00 00 00
					   00 00 00 08 00 0b 77 01 01 01 01 01
					   01 02 02 02 02 02 03
					39 01 00 00 00 00 15 d3 45 00 00 01 13
					   15 00 15 07 0f 77 77 77 37 b2 11 00
					   a0 3c 9c
					39 01 00 00 00 00 1a d7 00 b9 34 00 40
					   04 00 a0 0a 00 40 00 00 00 00 00 00
					   19 34 00 40 04 00 a0 0a
					39 01 00 00 00 00 34 d8 00 00 00 00 00
					   00 00 00 00 3a 00 3a 00 3a 00 3a 00
					   3a 05 00 00 00 00 00 00 00 00 00 0a
					   00 0a 00 00 00 00 00 00 00 00 00 00
					   00 00 00 0a 00 32 00 0a 00 22
					39 01 00 00 00 00 2b df 50 42 58 81 2d
					   00 00 00 00 00 00 6b 00 00 00 00 00
					   00 00 00 01 0f ff d4 0e 00 00 00 00
					   00 00 0f 53 f1 00 00 00 00 00 00 00
					   00
					39 01 00 00 00 00 02 f7 01
					39 01 00 00 00 00 02 b0 80
					39 01 00 00 00 00 0a e4 34 b4 00 00 00
					   39 04 09 34
					39 01 00 00 00 00 02 e6 00
					   01 04 04 04 04 04 05
					39 01 00 00 00 00 02 b0 04
					39 01 00 00 00 00 02 f7 01
					39 01 00 00 00 00 03 df 50 40
					39 01 00 00 00 00 06 f3 50 00 00 00 00
					39 01 00 00 00 00 02 f2 11
@@ -179,6 +150,7 @@
					05 01 00 00 78 00 01 11
					05 01 00 00 00 00 01 29
				];

				qcom,mdss-dsi-off-command = [
					05 01 00 00 14 00 02 28 00
					05 01 00 00 78 00 02 10 00];
@@ -197,7 +169,7 @@
			};

			timing@2 {
				qcom,mdss-dsi-panel-framerate = <60>;
				qcom,mdss-dsi-panel-framerate = <120>;
				qcom,mdss-dsi-panel-width = <1080>;
				qcom,mdss-dsi-panel-height = <2340>;
				qcom,mdss-dsi-h-front-porch = <95>;
@@ -216,23 +188,52 @@
				qcom,mdss-dsi-timing-switch-command = [
					39 01 00 00 00 00 02 b0 00
					39 01 00 00 00 00 1a c2 09 24 0c 00 00
					   0c 09 3c 00 09 3c 00 00 00 00 00 00
					   0c 00 00 00 09 3c 00 00 00 00 00 00
					   00 00 00 00 00 30 00 6c
				];

				qcom,mdss-dsi-on-command = [
					39 01 00 00 00 00 02 b0 00
					39 01 00 00 00 00 13 d8 00 00 00 00 00
					   00 00 00 00 5b 00 5b 00 5b 00 5b 00
					   5b
					39 01 00 00 00 00 0c c2 09 24 0c 00 00
					   0c 00 00 00 09 3c
					39 01 00 00 00 00 1a d7 00 b9 3c 00 40
					   04 00 a0 0a 00 40 00 00 00 00 00 00
					   19 3c 00 40 04 00 a0 0a
					39 01 00 00 00 00 02 b0 80
					39 01 00 00 00 00 02 e6 00
					39 01 00 00 00 00 14 de 40 00 18 00 18
					   00 18 00 18 10 00 18 00 18 00 18 02
					   00 00
					39 01 00 00 00 00 02 b0 04
					39 01 00 00 00 00 03 e8 00 02
					39 01 00 00 00 00 03 e4 00 08
					39 01 00 00 00 00 02 b0 00
					39 01 00 00 00 00 11 c4 00 00 00 00
					   00 00 00 00 00 00 00 02 00 00 00 32
					39 01 00 00 00 00 19 cf 64 0b 00 00 00
					   00 00 00 08 00 0b 77 01 01 01 01 01
					   01 04 04 04 04 04 05
					39 01 00 00 00 00 02 b0 04
					   01 02 02 02 02 02 03
					39 01 00 00 00 00 15 d3 45 00 00 01 13
					   15 00 15 07 0f 77 77 77 37 b2 11 00
					   a0 3c 9c
					39 01 00 00 00 00 1a d7 00 b9 34 00 40
					   04 00 a0 0a 00 40 00 00 00 00 00 00
					   19 34 00 40 04 00 a0 0a
					39 01 00 00 00 00 34 d8 00 00 00 00 00
					   00 00 00 00 3a 00 3a 00 3a 00 3a 00
					   3a 05 00 00 00 00 00 00 00 00 00 0a
					   00 0a 00 00 00 00 00 00 00 00 00 00
					   00 00 00 0a 00 32 00 0a 00 22
					39 01 00 00 00 00 2b df 50 42 58 81 2d
					   00 00 00 00 00 00 6b 00 00 00 00 00
					   00 00 00 01 0f ff d4 0e 00 00 00 00
					   00 00 0f 53 f1 00 00 00 00 00 00 00
					   00
					39 01 00 00 00 00 02 f7 01
					39 01 00 00 00 00 02 b0 80
					39 01 00 00 00 00 0a e4 34 b4 00 00 00
					   39 04 09 34
					39 01 00 00 00 00 02 e6 00
					39 01 00 00 00 00 02 b0 04
					39 01 00 00 00 00 03 df 50 40
					39 01 00 00 00 00 06 f3 50 00 00 00 00
					39 01 00 00 00 00 02 f2 11
@@ -246,6 +247,7 @@
					05 01 00 00 78 00 01 11
					05 01 00 00 00 00 01 29
				];

				qcom,mdss-dsi-off-command = [
					05 01 00 00 14 00 02 28 00
					05 01 00 00 78 00 02 10 00];
+1 −1
Original line number Diff line number Diff line
@@ -62,5 +62,5 @@
};

&sde_dsi {
	qcom,dsi-default-panel = <&dsi_r66451_amoled_video>;
	qcom,dsi-default-panel = <&dsi_r66451_amoled_cmd>;
};
+15 −19
Original line number Diff line number Diff line
@@ -239,16 +239,9 @@
&dsi_r66451_amoled_video {
	qcom,dsi-select-clocks = "mux_byte_clk0", "mux_pixel_clk0";
	qcom,mdss-dsi-display-timings {
		/*
		 * CDP could not display using the old HFP(96) and HSYNC(32).
		 * Modified HFP to 95 and HSYNC to 1, but using the new porch
		 * to caculator the PHY timing based on version YB, 90hz could
		 * not display, need to keep the PHY timing(which based on
		 * HFP=96, HSYNC=32).
		 */
		timing@0 {
			qcom,mdss-dsi-panel-phy-timings = [00 15 06 06 0a 09 06
				06 04 02 04 00 12 0b];
			qcom,mdss-dsi-panel-phy-timings = [00 16 06 05 14 1f 06
				06 06 02 04 00 14 0a];
			qcom,display-topology = <2 2 1>;
			qcom,default-topology-index = <0>;
		};
@@ -257,29 +250,32 @@

&dsi_r66451_amoled_cmd {
	qcom,ulps-enabled;
	qcom,esd-check-enabled;
	qcom,mdss-dsi-panel-status-check-mode = "reg_read";
	qcom,mdss-dsi-panel-status-command = [06 01 00 01 00 00 01 0a];
	qcom,mdss-dsi-panel-status-command-state = "dsi_lp_mode";
	qcom,mdss-dsi-panel-status-value = <0x1c>;
	qcom,mdss-dsi-panel-status-read-length = <1>;
	qcom,dsi-select-clocks = "mux_byte_clk0", "mux_pixel_clk0";
	qcom,dsi-select-sec-clocks = "mux_byte_clk1", "mux_pixel_clk1";
	qcom,mdss-dsi-display-timings {
		timing@0 {
			qcom,mdss-dsi-panel-phy-timings = [00 19 08 07 0c 0b 07
				07 05 02 04 00 16 0c];
			qcom,mdss-dsi-panel-phy-timings = [00 10 04 04 12 1e 04
				04 03 02 04 00 0e 09];
			qcom,display-topology = <2 2 1>;
			qcom,default-topology-index = <0>;
		};

		timing@1 {
			qcom,mdss-dsi-panel-phy-timings = [00 13 06 05 09 1f 06
				06 03 02 04 00 11 0a];
			qcom,mdss-dsi-panel-phy-timings = [00 16 06 05 14 1f 06
				06 06 02 04 00 14 0a];
			qcom,display-topology = <2 2 1>;
			qcom,default-topology-index = <0>;
		};
		/*
		 * Using PHY Timings version YB 60hz could not display,
		 * refer to version W, changed T_HS_ZERO from 0x06 to 0x1e.
		 */

		timing@2 {
			qcom,mdss-dsi-panel-phy-timings = [00 0d 04 04 07 1e 04
				04 02 02 04 00 0c 09];
			qcom,mdss-dsi-panel-phy-timings = [00 1c 08 07 17 16 07
				07 08 02 04 00 19 0c];
			qcom,display-topology = <2 2 1>;
			qcom,default-topology-index = <0>;
		};