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

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

Merge "ARM: dts: msm: Add dt node for ST Micro touch IC"

parents b0fd5a0d 97bdb86f

qcom/lahaina-cdp.dtsi

+26 −0
Original line number Diff line number Diff line
@@ -41,6 +41,32 @@ 
	};

};



&qupv3_se4_i2c {

	#address-cells = <1>;

	#size-cells = <0>;



	status = "ok";

	qcom,i2c-touch-active = "st,fts";



	st_fts@49 {

		compatible = "st,fts";

		reg = <0x49>;

		interrupt-parent = <&tlmm>;

		interrupts = <23 0x2008>;

		vdd-supply = <&L8C>;

		avdd-supply = <&L3C>;

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

		pinctrl-0 = <&ts_active>;

		pinctrl-1 = <&ts_int_suspend &ts_reset_suspend>;

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

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

		st,regulator_dvdd = "vdd";

		st,regulator_avdd = "avdd";

		panel = <&dsi_sw43404_amoled_cmd &dsi_sw43404_amoled_video

			 &dsi_sw43404_amoled_fhd_plus_cmd>;

	};

};



&sdhc_2 {

	vdd-supply = <&pm8350c_l9>;

	qcom,vdd-voltage-level = <2950000 2960000>;

qcom/lahaina-mtp.dtsi

+28 −0
Original line number Diff line number Diff line
@@ -41,6 +41,34 @@ 
	};

};



&qupv3_se4_i2c {

	#address-cells = <1>;

	#size-cells = <0>;



	status = "ok";

	qcom,i2c-touch-active = "st,fts";



	st_fts@49 {

		compatible = "st,fts";

		reg = <0x49>;

		interrupt-parent = <&tlmm>;

		interrupts = <23 0x2008>;

		vdd-supply = <&L8C>;

		avdd-supply = <&L3C>;

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

		pinctrl-0 = <&ts_active>;

		pinctrl-1 = <&ts_int_suspend &ts_reset_suspend>;

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

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

		st,x-flip = <1>;

		st,y-flip = <1>;

		st,regulator_dvdd = "vdd";

		st,regulator_avdd = "avdd";

		panel = <&dsi_sw43404_amoled_cmd &dsi_sw43404_amoled_video

			 &dsi_sw43404_amoled_fhd_plus_cmd>;

	};

};



&sdhc_2 {

	vdd-supply = <&pm8350c_l9>;

	qcom,vdd-voltage-level = <2950000 2960000>;

qcom/lahaina-pinctrl.dtsi

+61 −0
Original line number Diff line number Diff line
@@ -1471,6 +1471,67 @@ 
		};

	};



	/* touchscreen pins */

	pmx_ts_active {

		ts_active: ts_active {

			mux {

				pins = "gpio22", "gpio23";

				function = "gpio";

			};



			config {

				pins = "gpio22", "gpio23";

				drive-strength = <8>;

				bias-pull-up;

			};

		};

	};



	pmx_ts_reset_suspend {

		ts_reset_suspend: ts_reset_suspend {

			mux {

				pins = "gpio22";

				function = "gpio";

			};



			config {

				pins = "gpio22";

				drive-strength = <2>;

				bias-pull-down;

			};

		};

	};



	pmx_ts_int_suspend {

		ts_int_suspend: ts_int_suspend {

			mux {

				pins = "gpio23";

				function = "gpio";

			};



			config {

				pins = "gpio23";

				drive-strength = <2>;

				bias-pull-down;

			};

		};

	};



	pmx_ts_release {

		ts_release: ts_release {

			mux {

				pins = "gpio22", "gpio23";

				function = "gpio";

			};



			config {

				pins = "gpio22", "gpio23";

				drive-strength = <2>;

				bias-disable;

			};

		};

	};



	/* WSA speaker reset pins */

	spkr_1_sd_n {

		spkr_1_sd_n_sleep: spkr_1_sd_n_sleep {