Merge "defconfig: msm8953: Add ft5x06 touchscreen support" (2c24a4a8) · Commits · e / devices / android_kernel_fairphone_FP3

Documentation/devicetree/bindings/input/touchscreen/ft5x06-ts.txt

+79 −12

Original line number	Diff line number	Diff line
		@@ -22,7 +22,29 @@ Required properties:
		- focaltech,reset-gpio : reset gpio to control the reset of chip.
		- focaltech,display-coords : display coordinates in pixels. It is a four
		tuple consisting of min x, min y, max x and
		max y values.
		max y values
		- focaltech,name : name of the controller
		- focaltech,group-id : group id of this device
		- focaltech,hard-reset-delay-ms : hard reset delay in ms
		- focaltech,soft-reset-delay-ms : soft reset delay in ms
		- focaltech,fw-delay-aa-ms : specify the delay in ms after programming 0xaa
		register for firmware upgrade
		- focaltech,fw-delay-55-ms : specify the delay in ms after programming 0x55
		register for firmware upgrade
		- focaltech,fw-upgrade-id1 : specify the upgrade id1 for firmware upgrade
		- focaltech,fw-upgrade-id2 : specify the upgrade id2 for firmware upgrade
		- focaltech,fw-delay-readid-ms : specify the read id delay in ms for firmware upgrade
		- focaltech,fw-delay-era-flsh-ms : specify the erase flash delay in ms for firmware upgrade
		- pinctrl-names : This should be defined if a target uses pinctrl framework.
		See "pinctrl" in Documentation/devicetree/bindings/pinctrl/msm-pinctrl.txt.
		Specify the names of the configs that pinctrl can install in driver.
		Following are the pinctrl configs that can be installed:
		"pmx_ts_active" : Active configuration of pins, this should specify active
		config defined in pin groups of interrupt and reset gpio.
		"pmx_ts_suspend" : Disabled configuration of pins, this should specify sleep
		config defined in pin groups of interrupt and reset gpio.
		"pmx_ts_release" : Release configuration of pins, this should specify
		release config defined in pin groups of interrupt and reset gpio.

		Optional properties:

		@@ -32,22 +54,67 @@ Optional properties:
		- focaltech,i2c-pull-up : to specify pull up is required.
		- focaltech,no-force-update : to specify force update is allowed.
		- focaltech,button-map : button map of key codes. The number
		of key codes depend on panel.
		of key codes depend on panel
		- focaltech,fw-name : specify the firmware file name
		- focaltech,fw-delay-aa-ms : specify the "aa" delay in ms for firmware upgrade
		- focaltech,fw-delay-55-ms : specify the "55" delay in ms for firmware upgrade
		- focaltech,fw-upgrade-id1 : specify the upgrade id1 for firmware upgrade
		- focaltech,fw-upgrade-id2 : specify the upgrade id2 for firmware upgrade
		- focaltech,fw-delay-readid-ms : specify the read id delay in ms for firmware upgrade
		- focaltech,fw-delay-era-flsh-ms : specify the erase flash delay in ms for firmware upgrade
		- focaltech,fw-auto-cal : specify whether calibration is needed after firmware upgrade
		- focaltech,fw-vkey-support : specify if virtual keys are supported through firmware
		- focaltech,ignore-id-check : specify ignore family-id check
		- focaltech,panel-coords : panel coordinates for the chip in pixels.
		It is a four tuple consisting of min x,
		min y, max x and max y values
		- focaltech,fw-name : specify the firmware file name
		- focaltech,psensor-support : specify whether support the proximity sensor
		- focaltech,gesture-support : specify whether support gesture feature
		- focaltech,resume-in-workqueue : specifiy whether to defer the resume to workqueue
		- clock-names: : Clock names used for secure touch. They are: "iface_clk", "core_clk"
		- clocks : Defined if 'clock-names' DT property is defined. These clocks
		are associated with the underlying I2C bus.

		Example:
		i2c@f9924000 {
		ft5x06_ts@38 {
		i2c@f9923000{
		focaltech@38{
		compatible = "focaltech,5x06";
		reg = <0x38>;
		interrupt-parent = <&msmgpio>;
		interrupts = <61 0x2>;
		vdd-supply = <&pm8941_l22>;
		vcc_i2c-supply = <&pm8941_s3>;
		focaltech,reset-gpio = <&msmgpio 60 0x00>;
		focaltech,irq-gpio = <&msmgpio 61 0x00>;
		focaltech,panel-coords = <0 0 480 800>;
		interrupts = <1 0x2>;
		vdd-supply = <&pm8110_l19>;
		vcc_i2c-supply = <&pm8110_l14>;
		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>;
		focaltech,name = "ft6x06";
		focaltech,family-id = <0x06>;
		focaltech,reset-gpio = <&msmgpio 0 0x00>;
		focaltech,irq-gpio = <&msmgpio 1 0x00>;
		focaltech,display-coords = <0 0 480 800>;
		focaltech,button-map= <158 102 139 217>;
		focaltech,family-id = <0x0a>;
		focaltech,panel-coords = <0 0 480 800>;
		focaltech,button-map= <139 102 158>;
		focaltech,no-force-update;
		focaltech,i2c-pull-up;
		focaltech,group-id = <1>;
		focaltech,hard-reset-delay = <20>;
		focaltech,soft-reset-delay = <150>;
		focaltech,num-max-touches = <2>;
		focaltech,fw-name = "ft_8610_qrd_fw.bin";
		focaltech,fw-delay-aa-ms = <100>;
		focaltech,fw-delay-55-ms = <30>;
		focaltech,fw-upgrade-id1 = <0x79>;
		focaltech,fw-upgrade-id2 = <0x08>;
		focaltech,fw-delay-readid-ms = <10>;
		focaltech,fw-delay-era-flsh-ms = <2000>;
		focaltech,fw-auto-cal;
		focaltech,psensor-support;
		focaltech,gesture-support;
		/* Underlying clocks used by secure touch */
		clock-names = "iface_clk", "core_clk";
		clocks = <&clock_gcc clk_gcc_blsp1_ahb_clk>,
		<&clock_gcc clk_gcc_blsp1_qup3_i2c_apps_clk>;
		};
		};

arch/arm/configs/msm8953-perf_defconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -288,6 +288,7 @@ CONFIG_KEYBOARD_GPIO=y
		# CONFIG_INPUT_MOUSE is not set
		CONFIG_INPUT_JOYSTICK=y
		CONFIG_INPUT_TOUCHSCREEN=y
		CONFIG_TOUCHSCREEN_FT5X06=y
		CONFIG_INPUT_MISC=y
		CONFIG_INPUT_HBTP_INPUT=y
		CONFIG_INPUT_QPNP_POWER_ON=y

arch/arm/configs/msm8953_defconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -293,6 +293,7 @@ CONFIG_KEYBOARD_GPIO=y
		# CONFIG_INPUT_MOUSE is not set
		CONFIG_INPUT_JOYSTICK=y
		CONFIG_INPUT_TOUCHSCREEN=y
		CONFIG_TOUCHSCREEN_FT5X06=y
		CONFIG_INPUT_MISC=y
		CONFIG_INPUT_HBTP_INPUT=y
		CONFIG_INPUT_QPNP_POWER_ON=y

drivers/input/touchscreen/Kconfig

+28 −0

Original line number	Diff line number	Diff line
		@@ -1205,6 +1205,24 @@ config TOUCHSCREEN_COLIBRI_VF50
		To compile this driver as a module, choose M here: the
		module will be called colibri_vf50_ts.

		config TOUCHSCREEN_FT5X06_PSENSOR
		tristate "FocalTech proximity feature support"
		depends on TOUCHSCREEN_FT5X06 && SENSORS
		help
		Say Y here if you want to support ft5x06's proximity
		feature.

		If unsure, say N.

		config TOUCHSCREEN_FT5X06_GESTURE
		tristate "FocalTech gesture feature support"
		depends on TOUCHSCREEN_FT5X06
		help
		Say Y here if you want to support ft5x06's gesture
		feature.

		If unsure, say N.

		config TOUCHSCREEN_ROHM_BU21023
		tristate "ROHM BU21023/24 Dual touch support resistive touchscreens"
		depends on I2C
		@@ -1240,4 +1258,14 @@ config TOUCHSCREEN_FT5X06
		To compile this driver as a module, choose M here: the
		module will be called ft5x06_ts.

		config FT_SECURE_TOUCH
		bool "Secure Touch support for Focaltech Touchscreen"
		depends on TOUCHSCREEN_FT5X06
		help
		Say Y here
		-Focaltech touch driver is connected
		-To enable secure touch for Focaltech touch driver

		If unsure, say N.

		endif

drivers/input/touchscreen/ft5x06_ts.c

+2245 −266

File changed.

Preview size limit exceeded, changes collapsed.