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

Commit 863822f1 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 msmtitanium"

parents f534a6b6 46fe8a96

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

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



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

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

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

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

};
@@ -190,7 +189,6 @@ 


	qcom,pluggable;

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

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

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

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

};

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

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



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

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

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

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

};
@@ -156,7 +155,6 @@ 


	qcom,pluggable;

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

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

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

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

};

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

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

			mdss_dsi_active: mdss_dsi_active {

				mux {

					pins = "gpio61", "gpio59", "gpio12";

					pins = "gpio61", "gpio59";

					function = "gpio";

				};



				config {

					pins = "gpio61", "gpio59", "gpio12";

					pins = "gpio61", "gpio59";

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

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

					output-high;
@@ -331,12 +331,12 @@ 


			mdss_dsi_suspend: mdss_dsi_suspend {

				mux {

					pins = "gpio61", "gpio59", "gpio12";

					pins = "gpio61", "gpio59";

					function = "gpio";

				};



				config {

					pins = "gpio61", "gpio59", "gpio12";

					pins = "gpio61", "gpio59";

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

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

				};