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

Commit d3dce1fa 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: Disable local lcd bias for msmgold"

parents de8bbd23 102c1a62

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

+0 −1
Original line number Diff line number Diff line
@@ -138,7 +138,6 @@ 
	pinctrl-1 = <&mdss_dsi_suspend &mdss_te_suspend>;



	qcom,platform-te-gpio = <&tlmm 24 0>;

	qcom,platform-enable-gpio = <&tlmm 99 0>;

	qcom,platform-reset-gpio = <&tlmm 60 0>;

	qcom,platform-bklight-en-gpio = <&tlmm 98 0>;

};

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

+0 −1
Original line number Diff line number Diff line
@@ -130,7 +130,6 @@ 
	pinctrl-1 = <&mdss_dsi_suspend &mdss_te_suspend>;



	qcom,platform-te-gpio = <&tlmm 24 0>;

	qcom,platform-enable-gpio = <&tlmm 99 0>;

	qcom,platform-reset-gpio = <&tlmm 60 0>;

	qcom,platform-bklight-en-gpio = <&tlmm 98 0>;

};

arch/arm/boot/dts/qcom/msmgold-pinctrl.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -209,12 +209,12 @@ 
		pmx_mdss: pmx_mdss {

			mdss_dsi_active: mdss_dsi_active {

				mux {

					pins = "gpio60", "gpio98", "gpio99";

					pins = "gpio60", "gpio98";

					function = "gpio";

				};



				config {

					pins = "gpio60", "gpio98", "gpio99";

					pins = "gpio60", "gpio98";

					drive-strength = <8>; /* 8 mA */

					bias-disable = <0>; /* no pull */

					output-high;
@@ -222,12 +222,12 @@ 
			};

			mdss_dsi_suspend: mdss_dsi_suspend {

				mux {

					pins = "gpio60", "gpio98", "gpio99";

					pins = "gpio60", "gpio98";

					function = "gpio";

				};



				config {

					pins = "gpio60", "gpio98", "gpio99";

					pins = "gpio60", "gpio98";

					drive-strength = <2>; /* 2 mA */

					bias-pull-down; /* pull down */

				};