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

Commit a5461710 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 touch device node for QVR845"

parents 40c7a512 9e861b91

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0
Original line number Diff line number Diff line
@@ -272,6 +272,7 @@ sunchip Shenzhen Sunchip Technology Co., Ltd 
SUNW	Sun Microsystems, Inc

swir	Sierra Wireless

syna	Synaptics Inc.

synaptics	Synaptics Inc.

synology	Synology, Inc.

tbs	TBS Technologies

tcg	Trusted Computing Group

arch/arm64/boot/dts/qcom/sdm845-pinctrl.dtsi

+117 −0
Original line number Diff line number Diff line
@@ -749,6 +749,123 @@ 
			};

		};



		/* add pingrp for touchscreen */

		pmx_ts_int_active {

			ts_int_active: ts_int_active {

				mux {

					pins = "gpio122";

					function = "gpio";

				};



				config {

					pins = "gpio122";

					drive-strength = <8>;

					bias-pull-up;

				};

			};

		};



		pmx_ts_int_suspend {

			ts_int_suspend1: ts_int_suspend1 {

				mux {

					pins = "gpio122";

					function = "gpio";

				};



				config {

					pins = "gpio122";

					drive-strength = <2>;

					bias-pull-down;

				};

			};

		};



		pmx_ts_reset_active {

			ts_reset_active: ts_reset_active {

				mux {

					pins = "gpio99";

					function = "gpio";

				};



				config {

					pins = "gpio99";

					drive-strength = <8>;

					bias-pull-up;

				};

			};

		};



		pmx_ts_reset_suspend {

			ts_reset_suspend1: ts_reset_suspend1 {

				mux {

					pins = "gpio99";

					function = "gpio";

				};



				config {

					pins = "gpio99";

					drive-strength = <2>;

					bias-pull-down;

				};

			};

		};



		pmx_ts_release {

			ts_release: ts_release {

				mux {

					pins = "gpio122", "gpio99";

					function = "gpio";

				};



				config {

					pins = "gpio122", "gpio99";

					drive-strength = <2>;

					bias-pull-down;

				};

			};

		};



		ts_mux {

			ts_active: ts_active {

				mux {

					pins = "gpio99", "gpio122";

					function = "gpio";

				};



				config {

					pins = "gpio99", "gpio122";

					drive-strength = <16>;

					bias-pull-up;

				};

			};



			ts_reset_suspend: ts_reset_suspend {

				mux {

					pins = "gpio99";

					function = "gpio";

				};



				config {

					pins = "gpio99";

					drive-strength = <2>;

					bias-pull-down;

				};

			};



			ts_int_suspend: ts_int_suspend {

				mux {

					pins = "gpio122";

					function = "gpio";

				};



				config {

					pins = "gpio122";

					drive-strength = <2>;

					bias-disable;

				};

			};

		};



		sec_aux_pcm {

			sec_aux_pcm_sleep: sec_aux_pcm_sleep {

				mux {

arch/arm64/boot/dts/qcom/sdm845-qvr.dtsi

+27 −0
Original line number Diff line number Diff line
@@ -217,3 +217,30 @@ 
&wil6210 {

	status = "ok";

};



&qupv3_se5_i2c {

	status = "ok";

	synaptics_dsx@20 {

		compatible = "synaptics,dsx-i2c";

		reg = <0x20>;

		interrupt-parent = <&tlmm>;

		interrupts = <122 0x2008>;

		vdd-supply = <&pm8998_l14>;

		avdd-supply = <&pm8998_l28>;

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

				"pmx_ts_release";

		pinctrl-0 = <&ts_int_active &ts_reset_active>;

		pinctrl-1 = <&ts_int_suspend &ts_reset_suspend>;

		pinctrl-2 = <&ts_release>;

		synaptics,pwr-reg-name = "avdd";

		synaptics,bus-reg-name = "vdd";

		synaptics,ub-i2c-addr = <0x2c>;

		synaptics,irq-gpio = <&tlmm 122 0x2008>;

		synaptics,reset-gpio = <&tlmm 99 0x0>;

		synaptics,irq-on-state = <0>;

		synaptics,power-delay-ms = <200>;

		synaptics,reset-delay-ms = <200>;

		synaptics,reset-on-state = <0>;

		synaptics,reset-active-ms = <20>;

	};

};