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

Commit 7c4355a9 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: allow dsi phy power off for nt35597 on msm8996 target"

parents 2771a578 c3981cd7

Documentation/devicetree/bindings/fb/mdss-dsi-panel.txt

+6 −1
Original line number Diff line number Diff line
@@ -416,7 +416,11 @@ Optional properties: 
					fields in the supply entry, refer to the qcom,ctrl-supply-entries

					binding above.

- qcom,config-select:			Optional property to select default configuration.



- qcom,panel-allow-phy-poweroff:	A boolean property indicates that panel allows to turn off the phy power

					supply during idle screen. A panel should able to handle the dsi lanes

					in floating state(not LP00 or LP11) to turn on this property. Software

					turns off PHY pmic power supply, phy ldo and DSI Lane ldo during

					idle screen (footswitch control off) when this property is enabled.

[[Optional config sub-nodes]]		These subnodes provide different configurations for a given same panel.

					Default configuration can be chosen by specifying phandle of the

					selected subnode in the qcom,config-select.
@@ -602,6 +606,7 @@ Example: 
		qcom,suspend-ulps-enabled;

		qcom,panel-roi-alignment = <4 4 2 2 20 20>;

		qcom,esd-check-enabled;

		qcom,panel-allow-phy-poweroff;

		qcom,mdss-dsi-panel-status-command = [06 01 00 01 05 00 02 0A 08];

		qcom,mdss-dsi-panel-status-command-state = "dsi_lp_mode";

		qcom,mdss-dsi-panel-status-check-mode = "reg_read";

arch/arm/boot/dts/qcom/msm8996-cdp.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -410,6 +410,7 @@ 
	qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;

	qcom,partial-update-enabled;

	qcom,panel-roi-alignment = <720 128 720 64 720 64>;

	qcom,panel-allow-phy-poweroff;

};



&dsi_nt35950_4k_dsc_cmd {
@@ -448,6 +449,7 @@ 
	qcom,mdss-dsi-bl-min-level = <1>;

	qcom,mdss-dsi-bl-max-level = <4095>;

	qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;

	qcom,panel-allow-phy-poweroff;

};



&dsi_dual_sharp_1080_120hz_cmd {

arch/arm/boot/dts/qcom/msm8996-mtp.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -398,6 +398,7 @@ 
	qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;

	qcom,partial-update-enabled;

	qcom,panel-roi-alignment = <720 128 720 64 720 64>;

	qcom,panel-allow-phy-poweroff;

};



&dsi_nt35950_4k_dsc_cmd {
@@ -436,6 +437,7 @@ 
	qcom,mdss-dsi-bl-min-level = <1>;

	qcom,mdss-dsi-bl-max-level = <4095>;

	qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;

	qcom,panel-allow-phy-poweroff;

};



&dsi_dual_sharp_1080_120hz_cmd {

drivers/video/msm/mdss/mdss_dsi_panel.c

+3 −0
Original line number Diff line number Diff line
@@ -1771,6 +1771,9 @@ static int mdss_dsi_parse_panel_features(struct device_node *np, 
	pinfo->panel_ack_disabled = pinfo->sim_panel_mode ?

		1 : of_property_read_bool(np, "qcom,panel-ack-disabled");



	pinfo->allow_phy_power_off = of_property_read_bool(np,

		"qcom,panel-allow-phy-poweroff");



	mdss_dsi_parse_esd_params(np, ctrl);



	if (pinfo->panel_ack_disabled && pinfo->esd_check_enabled) {

drivers/video/msm/mdss/mdss_panel.h

+1 −0
Original line number Diff line number Diff line
@@ -606,6 +606,7 @@ struct mdss_panel_info { 
	bool ulps_suspend_enabled;

	bool panel_ack_disabled;

	bool esd_check_enabled;

	bool allow_phy_power_off;

	char dfps_update;

	/* new requested fps before it is updated in hw */

	int new_fps;