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

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

Merge "input: touchscreen: Add new Focaltech touch driver"

parents 1b50fb88 76970c0c

arch/arm64/boot/dts/qcom/trinket-facepay.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -400,3 +400,7 @@ 
		report_type = <1>;

	};

};



&qupv3_se6_4uart {

	status = "ok";

};

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

+41 −0
Original line number Diff line number Diff line
@@ -461,6 +461,47 @@ 
			};

		};



		qupv3_se6_4uart_pins: qupv3_se6_4uart_pins {

			qupv3_se6_ctsrx: qupv3_se6_ctsrx {

				mux {

					pins = "gpio30", "gpio33";

					function = "qup11";

				};



				config {

					pins = "gpio30", "gpio33";

					drive-strength = <2>;

					bias-no-pull;

				};

			};



			qupv3_se6_rts: qupv3_se6_rts {

				mux {

					pins = "gpio31";

					function = "qup11";

				};



				config {

					pins = "gpio31";

					drive-strength = <2>;

					bias-pull-down;

				};

			};



			qupv3_se6_tx: qupv3_se6_tx {

				mux {

					pins = "gpio32";

					function = "qup11";

				};



				config {

					pins = "gpio32";

					drive-strength = <2>;

					bias-pull-up;

				};

			};

		};



		qupv3_se9_4uart_pins: qupv3_se9_4uart_pins {

			qupv3_se9_ctsrx: qupv3_se9_ctsrx {

				mux {

arch/arm64/boot/dts/qcom/trinket-qupv3.dtsi

+18 −0
Original line number Diff line number Diff line
@@ -269,6 +269,24 @@ 
		status = "disabled";

	};



	qupv3_se6_4uart: qcom,qup_uart@0x4c84000 {

		compatible = "qcom,msm-geni-serial-hs";

		reg = <0x4c84000 0x4000>;

		reg-names = "se_phys";

		clock-names = "se-clk", "m-ahb", "s-ahb";

		clocks = <&clock_gcc GCC_QUPV3_WRAP1_S1_CLK>,

			<&clock_gcc GCC_QUPV3_WRAP_1_M_AHB_CLK>,

			<&clock_gcc GCC_QUPV3_WRAP_1_S_AHB_CLK>;

		pinctrl-names = "default", "sleep";

		pinctrl-0 = <&qupv3_se6_ctsrx>, <&qupv3_se6_rts>,

			<&qupv3_se6_tx>;

		pinctrl-1 = <&qupv3_se6_ctsrx>, <&qupv3_se6_rts>,

			<&qupv3_se6_tx>;

		interrupts = <GIC_SPI 309 0>;

		qcom,wrapper-core = <&qupv3_1>;

		status = "disabled";

	};



	/* I2C */

	qupv3_se5_i2c: i2c@4c80000 {

		compatible = "qcom,i2c-geni";

drivers/input/touchscreen/focaltech_touch/Kconfig

0 → 100644
+14 −0
Original line number Diff line number Diff line 
#

# Focaltech Touchscreen driver configuration

#



config TOUCHSCREEN_FTS

	bool "Focaltech Touchscreen"

	help

	  Say Y here if you have Focaltech touch panel.

	  If unsure, say N.



config TOUCHSCREEN_FTS_DIRECTORY

	string "Focaltech ts directory name"

	default "focaltech_touch"

	depends on TOUCHSCREEN_FTS

drivers/input/touchscreen/focaltech_touch/Makefile

0 → 100644
+13 −0
Original line number Diff line number Diff line 
# Makefile for the focaltech touchscreen drivers.





obj-$(CONFIG_TOUCHSCREEN_FTS)	+=  focaltech_core.o

obj-$(CONFIG_TOUCHSCREEN_FTS)	+=  focaltech_ex_fun.o

obj-$(CONFIG_TOUCHSCREEN_FTS)	+=  focaltech_ex_mode.o

obj-$(CONFIG_TOUCHSCREEN_FTS)	+=  focaltech_gesture.o

obj-$(CONFIG_TOUCHSCREEN_FTS)	+=  focaltech_esdcheck.o

obj-$(CONFIG_TOUCHSCREEN_FTS)	+=  focaltech_point_report_check.o



obj-$(CONFIG_TOUCHSCREEN_FTS)	+=  focaltech_i2c.o

obj-$(CONFIG_TOUCHSCREEN_FTS)	+=  focaltech_flash.o

obj-$(CONFIG_TOUCHSCREEN_FTS)	+=  focaltech_flash/