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

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

Merge "ARM: dts: msm: enable ESD for Qsync panels on Kona"

parents ab20c60f 6681e671
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@
				qcom,mdss-dsi-video-mode;
				qcom,mdss-dsi-panel-width = <720>;
				qcom,mdss-dsi-panel-height = <2560>;
				qcom,mdss-dsi-h-front-porch = <20>;
				qcom,mdss-dsi-h-front-porch = <80>;
				qcom,mdss-dsi-h-back-porch = <12>;
				qcom,mdss-dsi-h-pulse-width = <8>;
				qcom,mdss-dsi-h-sync-skew = <0>;
@@ -811,7 +811,7 @@
			timing@7 {
				qcom,mdss-dsi-panel-width = <540>;
				qcom,mdss-dsi-panel-height = <1920>;
				qcom,mdss-dsi-h-front-porch = <20>;
				qcom,mdss-dsi-h-front-porch = <80>;
				qcom,mdss-dsi-h-back-porch = <12>;
				qcom,mdss-dsi-h-pulse-width = <8>;
				qcom,mdss-dsi-h-sync-skew = <0>;
+2 −1
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@
		qcom,mdss-dsi-stream = <0>;
		qcom,mdss-dsi-bpp = <24>;
		qcom,mdss-dsi-border-color = <0>;
		qcom,mdss-dsi-bllp-power-mode;
		qcom,mdss-dsi-traffic-mode = "burst_mode";
		qcom,mdss-dsi-bllp-eof-power-mode;
		qcom,mdss-dsi-lane-0-state;
@@ -34,7 +35,7 @@
			timing@0 {
				qcom,mdss-dsi-panel-width = <720>;
				qcom,mdss-dsi-panel-height = <2560>;
				qcom,mdss-dsi-h-front-porch = <20>;
				qcom,mdss-dsi-h-front-porch = <80>;
				qcom,mdss-dsi-h-back-porch = <12>;
				qcom,mdss-dsi-h-pulse-width = <8>;
				qcom,mdss-dsi-h-sync-skew = <0>;
+12 −0
Original line number Diff line number Diff line
@@ -41,12 +41,24 @@
};

&dsi_sharp_qsync_wqhd_cmd {
	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 = <0x9c>;
	qcom,mdss-dsi-panel-status-read-length = <1>;
	qcom,panel-supply-entries = <&dsi_panel_pwr_supply_lab_ibb>;
	qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_wled";
	/delete-property/ qcom,platform-en-gpio;
};

&dsi_sharp_qsync_wqhd_video {
	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 = <0x9c>;
	qcom,mdss-dsi-panel-status-read-length = <1>;
	qcom,panel-supply-entries = <&dsi_panel_pwr_supply_lab_ibb>;
	qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_wled";
	/delete-property/ qcom,platform-en-gpio;
+6 −6
Original line number Diff line number Diff line
@@ -393,8 +393,8 @@
		};

		timing@1 { /* WQHD 60FPS VID */
			qcom,mdss-dsi-panel-phy-timings = [00 14 05 05 1f 1f 05
				05 03 02 04 00 12 15];
			qcom,mdss-dsi-panel-phy-timings = [00 16 06 05 20 1f 06
				06 03 02 04 00 13 15];
			qcom,display-topology = <2 2 2>;
			qcom,default-topology-index = <0>;
		};
@@ -427,8 +427,8 @@
		};

		timing@5 { /* WQHD 120FPS VID */
			qcom,mdss-dsi-panel-phy-timings = [00 14 05 05 1f 1f 05
				05 03 02 04 00 12 15];
			qcom,mdss-dsi-panel-phy-timings = [00 16 06 05 20 1f 06
				06 03 02 04 00 13 15];
			qcom,display-topology = <2 2 2>;
			qcom,default-topology-index = <0>;
		};
@@ -457,8 +457,8 @@
	qcom,dsi-select-clocks = "mux_byte_clk0", "mux_pixel_clk0";
	qcom,mdss-dsi-display-timings {
		timing@0 {
			qcom,mdss-dsi-panel-phy-timings = [00 14 05 05 1f 1f 05
				05 03 02 04 00 12 15];
			qcom,mdss-dsi-panel-phy-timings = [00 16 06 05 20 1f 06
				06 03 02 04 00 13 15];
			qcom,display-topology = <2 2 2>;
			qcom,default-topology-index = <0>;
		};
+6 −6
Original line number Diff line number Diff line
@@ -585,8 +585,8 @@
		};

		timing@1 { /* WQHD 60FPS VID */
			qcom,mdss-dsi-panel-phy-timings = [00 14 05 05 1f 1f 05
				05 03 02 04 00 12 15];
			qcom,mdss-dsi-panel-phy-timings = [00 16 06 05 20 1f 06
				06 03 02 04 00 13 15];
			qcom,display-topology = <2 2 2>;
			qcom,default-topology-index = <0>;
		};
@@ -619,8 +619,8 @@
		};

		timing@5 { /* WQHD 120FPS VID */
			qcom,mdss-dsi-panel-phy-timings = [00 14 05 05 1f 1f 05
				05 03 02 04 00 12 15];
			qcom,mdss-dsi-panel-phy-timings = [00 16 06 05 20 1f 06
				06 03 02 04 00 13 15];
			qcom,display-topology = <2 2 2>;
			qcom,default-topology-index = <0>;
		};
@@ -650,8 +650,8 @@
	qcom,dsi-select-clocks = "mux_byte_clk0", "mux_pixel_clk0";
	qcom,mdss-dsi-display-timings {
		timing@0 {
			qcom,mdss-dsi-panel-phy-timings = [00 14 05 05 1f 1f 05
				05 03 02 04 00 12 15];
			qcom,mdss-dsi-panel-phy-timings = [00 16 06 05 20 1f 06
				06 03 02 04 00 13 15];
			qcom,display-topology = <2 2 2>;
			qcom,default-topology-index = <0>;
		};