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

Commit 3f4d237a 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 display panel support for Liquid apq8084"

parents bf680d2a 7894b6d1
Loading
Loading
Loading
Loading
+13 −3
Original line number Diff line number Diff line
@@ -89,8 +89,10 @@
	};
};

/include/ "dsi-panel-jdi-1080p-video.dtsi"
&dsi_jdi_1080_vid {
/include/ "dsi-panel-jdi-dualmipi0-video.dtsi"
/include/ "dsi-panel-jdi-dualmipi1-video.dtsi"

&dsi_dual0_jdi_video {
	qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_pwm";
	qcom,mdss-dsi-bl-pmic-pwm-frequency = <100>;
	qcom,mdss-dsi-bl-pmic-bank-select = <2>;
@@ -107,13 +109,21 @@
        qcom,hdmi-tx-mux-sel = <&msmgpio 85 0>;
};

&mdss_fb0 {
	qcom,memory-reservation-size = <0x1C20000>;
};

&mdss_dsi0 {
	qcom,dsi-pref-prim-pan = <&dsi_jdi_1080_vid>;
	qcom,dsi-pref-prim-pan = <&dsi_dual0_jdi_video>;
	qcom,platform-reset-gpio = <&msmgpio 96 0>;
	qcom,platform-enable-gpio = <&msmgpio 137 0>;
	qcom,platform-bklight-en-gpio = <&msmgpio 86 0>;
};

&mdss_dsi1 {
	qcom,dsi-pref-prim-pan = <&dsi_dual1_jdi_video>;
};

&blsp2_uart1 {
	status = "ok";
};
+8 −0
Original line number Diff line number Diff line
@@ -174,6 +174,14 @@
		vddio-supply = <&pma8084_l12>;
		vdda-supply = <&pma8084_l2>;
		qcom,mdss-fb-map = <&mdss_fb0>;
		qcom,platform-strength-ctrl = [ff 06];
		qcom,platform-bist-ctrl = [00 00 b1 ff 00 00];
		qcom,platform-regulator-settings = [07 09 03 00 20 00 01];
		qcom,platform-lane-config = [00 00 00 00 00 00 00 01 97
			00 00 00 00 05 00 00 01 97
			00 00 00 00 0a 00 00 01 97
			00 00 00 00 0f 00 00 01 97
			00 c0 00 00 00 00 00 01 bb];
	};

	mdss_hdmi_tx: qcom,hdmi_tx@fd922100 {