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

Commit ec982ae8 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 pinctrl support for TE GPIO for msm8916"

parents aabaf6ef 318eeaff

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

+7 −2
Original line number Diff line number Diff line
@@ -274,11 +274,16 @@ 
	qcom,pins = <&gp 97>, <&gp 25>, <&gp 98>;

};



&pmx_mdss_te {

	qcom,num-grp-pins = <1>;

	qcom,pins = <&gp 24>;

};



&mdss_dsi0 {

	qcom,dsi-pref-prim-pan = <&dsi_jdi_1080_vid>;

	pinctrl-names = "mdss_default", "mdss_sleep";

	pinctrl-0 = <&mdss_dsi_active>;

	pinctrl-1 = <&mdss_dsi_suspend>;

	pinctrl-0 = <&mdss_dsi_active &mdss_te_active>;

	pinctrl-1 = <&mdss_dsi_suspend &mdss_te_suspend>;



	qcom,platform-enable-gpio = <&msm_gpio 97 0>;

	qcom,platform-reset-gpio = <&msm_gpio 25 0>;

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

+7 −2
Original line number Diff line number Diff line
@@ -258,11 +258,16 @@ 
	qcom,pins = <&gp 97>, <&gp 25>, <&gp 98>;

};



&pmx_mdss_te {

	qcom,num-grp-pins = <1>;

	qcom,pins = <&gp 24>;

};



&mdss_dsi0 {

	qcom,dsi-pref-prim-pan = <&dsi_jdi_1080_vid>;

	pinctrl-names = "mdss_default", "mdss_sleep";

	pinctrl-0 = <&mdss_dsi_active>;

	pinctrl-1 = <&mdss_dsi_suspend>;

	pinctrl-0 = <&mdss_dsi_active &mdss_te_active>;

	pinctrl-1 = <&mdss_dsi_suspend &mdss_te_suspend>;



	qcom,platform-enable-gpio = <&msm_gpio 97 0>;

	qcom,platform-reset-gpio = <&msm_gpio 25 0>;

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

+16 −0
Original line number Diff line number Diff line
@@ -459,6 +459,7 @@ 


		pmx_mdss: pmx_mdss {

			label = "mdss-pins";

			qcom,pin-func = <0>;

			mdss_dsi_active: active {

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

				bias-disable = <0>; /* no pull */
@@ -542,6 +543,21 @@ 
			};

		};



		pmx_mdss_te: pmx_mdss_te {

			label = "mdss-te-pin";

			qcom,pin-func = <1>;

			mdss_te_active: active {

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

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

				input-debounce = <0>;

			};

			mdss_te_suspend: suspend {

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

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

				input-debounce = <0>;

			};

		};



		/* CoreSight */

		tpiu_seta_1 {

			qcom,pins = <&gp 8>;