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

Commit f71490ad 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: update pinctrl for touch gpios in msmcobalt"

parents 47bd5a5b 1b922bdb

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

+1 −1
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ 
		synaptics,avdd-current = <20000>;

		pinctrl-names = "pmx_ts_active", "pmx_ts_suspend";

		pinctrl-0 = <&ts_active>;

		pinctrl-1 = <&ts_suspend>;

		pinctrl-1 = <&ts_int_suspend &ts_reset_suspend>;

		synaptics,display-coords = <0 0 1439 2559>;

		synaptics,panel-coords = <0 0 1439 2559>;

		synaptics,reset-gpio = <&tlmm 89 0x00>;

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

+1 −1
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ 
		synaptics,avdd-current = <20000>;

		pinctrl-names = "pmx_ts_active", "pmx_ts_suspend";

		pinctrl-0 = <&ts_active>;

		pinctrl-1 = <&ts_suspend>;

		pinctrl-1 = <&ts_int_suspend &ts_reset_suspend>;

		synaptics,display-coords = <0 0 1439 2559>;

		synaptics,panel-coords = <0 0 1439 2559>;

		synaptics,reset-gpio = <&tlmm 89 0x00>;

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

+16 −3
Original line number Diff line number Diff line
@@ -1543,18 +1543,31 @@ 
				};

			};



			ts_suspend: ts_suspend {

			ts_reset_suspend: ts_reset_suspend {

				mux {

					pins = "gpio89", "gpio125";

					pins = "gpio89";

					function = "gpio";

				};



				config {

					pins = "gpio89", "gpio125";

					pins = "gpio89";

					drive-strength = <2>;

					bias-pull-down;

				};

			};



			ts_int_suspend: ts_int_suspend {

				mux {

					pins = "gpio125";

					function = "gpio";

				};



				config {

					pins = "gpio125";

					drive-strength = <2>;

					bias-disable;

				};

			};

		};



		sdc2_clk_on: sdc2_clk_on {