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

Commit 2ed1a9eb 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: fix JDI 4K non-fbc panel configuration for 8996"

parents 29a3d45b 08668484
Loading
Loading
Loading
Loading
+9 −9
Original line number Diff line number Diff line
@@ -44,21 +44,21 @@
		qcom,mdss-dsi-lane-3-state;
		qcom,mdss-dsi-panel-timings = [3e 38 26 00 68 6e 2a 3c 2c 03
									04 00];
		qcom,mdss-dsi-t-clk-post = <0x0d>;
		qcom,mdss-dsi-t-clk-pre = <0x3e>;
		qcom,mdss-dsi-t-clk-post = <0x12>;
		qcom,mdss-dsi-t-clk-pre = <0x34>;
		qcom,mdss-dsi-bl-max-level = <4095>;
		qcom,mdss-dsi-dma-trigger = "trigger_sw";
		qcom,mdss-dsi-mdp-trigger = "none";
		qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_pwm";
		qcom,mdss-dsi-on-command = [23 01 00 00 0a 00 02 b0 04
				29 01 00 00 0a 00 08 b3 14 08 00 00 00 00 00
				23 01 00 00 0a 00 02 d6 01];

		qcom,mdss-dsi-post-panel-on-command = [15 01 00 00 0a 00 02 51 FF
		qcom,mdss-dsi-on-command = [15 01 00 00 0a 00 02 51 FF
				15 01 00 00 0a 00 02 53 24
				05 01 00 00 c9 00 01 11
				23 01 00 00 0a 00 02 b0 04
				29 01 00 00 0a 00 08 b3 14 08 00 00 00 00 00
				23 01 00 00 0a 00 02 d6 01
				05 01 00 00 50 00 01 29];
					/* Set display on, wait 16ms */

		qcom,mdss-dsi-on-command-state = "dsi_hs_mode";
		qcom,mdss-dsi-off-command = [05 01 00 00 32 00 02 28 00
					05 01 00 00 78 00 02 10 00];
+12 −0
Original line number Diff line number Diff line
@@ -463,6 +463,18 @@
	qcom,panel-roi-alignment = <4 4 2 2 20 20>;
};

&dsi_dual_jdi_4k_nofbc_video {
	pwms = <&pmi8994_pwm_4 0 0>;
	pwm-names = "backlight";
	qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_pwm";
	qcom,mdss-dsi-bl-pwm-pmi;
	qcom,mdss-dsi-bl-pmic-pwm-frequency = <100>;
	qcom,mdss-dsi-bl-min-level = <1>;
	qcom,mdss-dsi-bl-max-level = <4095>;
	qcom,cont-splash-enabled;
	qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;
};

&pm8994_gpios {
	gpio@c700 { /* GPIO 8 - WLAN_EN */
		qcom,mode = <1>;		/* Digital output*/
+1 −0
Original line number Diff line number Diff line
@@ -334,6 +334,7 @@
	qcom,mdss-dsi-bl-pmic-pwm-frequency = <100>;
	qcom,mdss-dsi-bl-min-level = <1>;
	qcom,mdss-dsi-bl-max-level = <4095>;
	qcom,cont-splash-enabled;
	qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;
};

+6 −5
Original line number Diff line number Diff line
@@ -182,11 +182,12 @@
};

&dsi_dual_jdi_4k_nofbc_video {
	qcom,mdss-dsi-panel-timings-8996 = [31 2e 0d 12 0d 03 04 a0
		31 2e 0d 12 0d 03 04 a0
		31 2e 0d 12 0d 03 04 a0
		31 2e 0d 12 0d 03 04 a0
		31 53 0c 12 0d 03 04 a0];
	qcom,mdss-dsi-panel-timings-8996 = [
		2c 27 0e 10 0a 03 04 a0
		2c 27 0e 10 0a 03 04 a0
		2c 27 0e 10 0a 03 04 a0
		2c 27 0e 10 0a 03 04 a0
		2c 32 0e 0f 0a 03 04 a0];
};

&dsi_hx8379a_fwvga_truly_vid {
+12 −0
Original line number Diff line number Diff line
@@ -444,6 +444,18 @@
	qcom,panel-roi-alignment = <4 4 2 2 20 20>;
};

&dsi_dual_jdi_4k_nofbc_video {
	pwms = <&pmi8994_pwm_4 0 0>;
	pwm-names = "backlight";
	qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_pwm";
	qcom,mdss-dsi-bl-pwm-pmi;
	qcom,mdss-dsi-bl-pmic-pwm-frequency = <100>;
	qcom,mdss-dsi-bl-min-level = <1>;
	qcom,mdss-dsi-bl-max-level = <4095>;
	qcom,cont-splash-enabled;
	qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;
};

/{
	mtp_batterydata: qcom,battery-data {
		qcom,batt-id-range-pct = <15>;