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

Commit be1c2aa9 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: msm: dts: enable touch node for wearable"

parents 0478643c 69f55e04

arch/arm64/boot/dts/qcom/sda429-bg-dvt2-wtp-overlay.dts

+27 −0
Original line number Diff line number Diff line
@@ -25,3 +25,30 @@ 
	qcom,pmic-id = <0x0002001b 0x0 0x0 0x0>;

};



&i2c_4 {

	status = "ok";



	raydium_ts@39 {

		compatible = "raydium,raydium-ts";

		reg = <0x39>;

		interrupt-parent = <&tlmm>;

		interrupts = <13 0x2008>;

		vdd_ana-supply = <&pm660_l11>;

		vcc_i2c-supply = <&pm660_l13>;

		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>;

		raydium,reset-gpio = <&tlmm 64 0x00>;

		raydium,irq-gpio = <&tlmm 65 0x00>;

		raydium,num-max-touches = <2>;

		raydium,soft-reset-delay-ms = <50>;

		raydium,hard-reset-delay-ms = <100>;

		raydium,x_max = <416>;

		raydium,y_max = <416>;

		raydium,display-coords= <0  0 416 416>;

		raydium,fw_id = <0x2202>;

	};

};

arch/arm64/boot/dts/qcom/sda429-wtp-overlay.dts

+0 −3
Original line number Diff line number Diff line
@@ -27,9 +27,6 @@ 


&i2c_4 {

	status = "ok";

	tsc@24 {

		status = "disabled";

	};



	raydium_ts@39 {

		compatible = "raydium,raydium-ts";

arch/arm64/boot/dts/qcom/sdm429-bg-dvt2-wtp-overlay.dts

+27 −0
Original line number Diff line number Diff line
@@ -26,3 +26,30 @@ 


};



&i2c_4 {

	status = "ok";



	raydium_ts@39 {

		compatible = "raydium,raydium-ts";

		reg = <0x39>;

		interrupt-parent = <&tlmm>;

		interrupts = <13 0x2008>;

		vdd_ana-supply = <&pm660_l11>;

		vcc_i2c-supply = <&pm660_l13>;

		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>;

		raydium,reset-gpio = <&tlmm 64 0x00>;

		raydium,irq-gpio = <&tlmm 65 0x00>;

		raydium,num-max-touches = <2>;

		raydium,soft-reset-delay-ms = <50>;

		raydium,hard-reset-delay-ms = <100>;

		raydium,x_max = <416>;

		raydium,y_max = <416>;

		raydium,display-coords= <0  0 416 416>;

		raydium,fw_id = <0x2202>;

	};

};

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

+75 −0
Original line number Diff line number Diff line
@@ -969,5 +969,80 @@ 
				};

			};

		};



		pmx_ts_int_active {

			ts_int_active: ts_int_active {

				mux {

					pins = "gpio65";

					function = "gpio";

				};



				config {

					pins = "gpio65";

					drive-strength = <8>;

					bias-pull-up;

				};

			};

		};



		pmx_ts_int_suspend {

			ts_int_suspend: ts_int_suspend {

				mux {

					pins = "gpio65";

					function = "gpio";

				};



				config {

					pins = "gpio65";

					drive-strength = <2>;

					bias-pull-down;

				};

			};

		};



		pmx_ts_reset_active {

			ts_reset_active: ts_reset_active {

				mux {

					pins = "gpio64";

					function = "gpio";

				};



				config {

					pins = "gpio64";

					drive-strength = <8>;

					bias-pull-up;

				};

			};

		};



		pmx_ts_reset_suspend {

			ts_reset_suspend: ts_reset_suspend {

				mux {

					pins = "gpio64";

					function = "gpio";

				};



				config {

					pins = "gpio64";

					drive-strength = <2>;

					bias-pull-down;

				};

			};

		};



		pmx_ts_release {

			ts_release: ts_release {

				mux {

					pins = "gpio65", "gpio64";

					function = "gpio";

				};



				config {

					pins = "gpio65", "gpio64";

					drive-strength = <2>;

					bias-pull-down;

				};

			};

		};

	};

};

arch/arm64/boot/dts/qcom/sdm429-wtp-overlay.dts

+0 −3
Original line number Diff line number Diff line
@@ -46,9 +46,6 @@ 


&i2c_4 {

	status = "ok";

	tsc@24 {

		status = "disabled";

	};



	raydium_ts@39 {

		compatible = "raydium,raydium-ts";