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

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

Merge "ARM: dts: msm: enable STM FTS touchscreen"

parents 29621299 e6bc854d

arch/arm64/boot/dts/qcom/kona-cdp.dtsi

+22 −0
Original line number Diff line number Diff line
@@ -113,6 +113,28 @@ 
	};

};



&qupv3_se13_i2c {

	#address-cells = <1>;

	#size-cells = <0>;

	status = "ok";



	st_fts@49 {

		compatible = "st,fts";

		reg = <0x49>;

		interrupt-parent = <&tlmm>;

		interrupts = <39 0x2008>;

		vdd-supply = <&pm8150a_l1>;

		avdd-supply = <&pm8150_l13>;

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

		pinctrl-0 = <&ts_active>;

		pinctrl-1 = <&ts_int_suspend &ts_reset_suspend>;

		st,irq-gpio = <&tlmm 39 0x2008>;

		st,reset-gpio = <&tlmm 38 0x00>;

		st,regulator_dvdd = "vdd";

		st,regulator_avdd = "avdd";

	};

};



&vendor {

	bluetooth: bt_qca6390 {

		compatible = "qca,qca6390";

arch/arm64/boot/dts/qcom/kona-mtp.dtsi

+25 −0
Original line number Diff line number Diff line
@@ -102,6 +102,31 @@ 
	};

};



&qupv3_se13_i2c {

	#address-cells = <1>;

	#size-cells = <0>;



	status = "ok";



	st_fts@49 {

		compatible = "st,fts";

		reg = <0x49>;

		interrupt-parent = <&tlmm>;

		interrupts = <39 0x2008>;

		vdd-supply = <&pm8150a_l1>;

		avdd-supply = <&pm8150_l13>;

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

		pinctrl-0 = <&ts_active>;

		pinctrl-1 = <&ts_int_suspend &ts_reset_suspend>;

		st,irq-gpio = <&tlmm 39 0x2008>;

		st,reset-gpio = <&tlmm 38 0x00>;

		st,regulator_dvdd = "vdd";

		st,regulator_avdd = "avdd";

		st,x-flip = <1>;

		st,y-flip = <1>;

	};

};



&vendor {

	bluetooth: bt_qca6390 {

		compatible = "qca,qca6390";

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

+45 −0
Original line number Diff line number Diff line
@@ -192,6 +192,51 @@ 
			};

		};



		pmx_ts_active {

			ts_active: ts_active {

					mux {

						pins = "gpio38", "gpio39";

						function = "gpio";

					};



					config {

						pins = "gpio38", "gpio39";

						drive-strength = <8>;

						bias-pull-up;

					};

			};

		};



		pmx_ts_int_suspend {

			ts_int_suspend: ts_int_suspend {

				mux {

					pins = "gpio39";

					function = "gpio";

				};



				config {

					pins = "gpio39";

					drive-strength = <2>;

					bias-pull-down;

				};

			};

		};



		pmx_ts_reset_suspend {

			ts_reset_suspend: ts_reset_suspend {

				mux {

					pins = "gpio38";

					function = "gpio";

				};



				config {

					pins = "gpio38";

					drive-strength = <2>;

					bias-pull-down;

				};

			};

		};



		ufs_dev_reset_assert: ufs_dev_reset_assert {

			config {

				pins = "ufs_reset";

arch/arm64/boot/dts/qcom/kona-qrd.dtsi

+23 −0
Original line number Diff line number Diff line
@@ -101,6 +101,29 @@ 
	};

};



&qupv3_se13_i2c {

	#address-cells = <1>;

	#size-cells = <0>;



	status = "ok";



	st_fts@49 {

		compatible = "st,fts";

		reg = <0x49>;

		interrupt-parent = <&tlmm>;

		interrupts = <39 0x2008>;

		vdd-supply = <&pm8150a_l1>;

		avdd-supply = <&pm8150_l13>;

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

		pinctrl-0 = <&ts_active>;

		pinctrl-1 = <&ts_int_suspend &ts_reset_suspend>;

		st,irq-gpio = <&tlmm 39 0x2008>;

		st,reset-gpio = <&tlmm 38 0x00>;

		st,regulator_dvdd = "vdd";

		st,regulator_avdd = "avdd";

	};

};



&ufsphy_mem {

	compatible = "qcom,ufs-phy-qmp-v4";