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

Commit 5cc0bff8 authored by Mao Li's avatar Mao Li Committed by Gerrit - the friendly Code Review server
Browse files

input: ft5x06_ts: add gesture feature support 



Focaltech touch controller FT6436 support new feature Screen-off-Gesture.
It is able to turn on the screen by drawing gestures on the touch screen
when the screen is during off status. Enable the FT CTP driver to support
the screen off gesture recognization.

This patch is propagated from msm-3.10 kernel.
(commit: c5150a8b762c54b76c5a27e904620dd5dee40ee7
input: ft5x06_ts: add gesture feature support)
Also cleared checkpatch warnings on 3.18 kernel.
WARNING: Missing a blank line after declarations
+       int err;
+       ft5x06_ts_start(dev);

WARNING: Missing a blank line after declarations
+       int i;
+       for (i = 0; i < 2; i++) {

Change-Id: I77d111d3ef800b636a337221d7e605f746a113dd
Signed-off-by: default avatarMao Li <maol@codeaurora.org>
Signed-off-by: default avatarSudhakar Manapati <smanap@codeaurora.org>
parent 8726963b

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

+2 −0
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ Optional properties: 
				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



Example:

	i2c@f9923000{
@@ -106,5 +107,6 @@ Example: 
			focaltech,fw-delay-era-flsh-ms = <2000>;

			focaltech,fw-auto-cal;

			focaltech,psensor-support;

			focaltech,gesture-support;

		};

	};

drivers/input/touchscreen/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -985,6 +985,15 @@ config TOUCHSCREEN_FT5X06_PSENSOR 


         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_MSTAR21XX

	tristate "mstar touchscreens"

	depends on I2C

drivers/input/touchscreen/ft5x06_ts.c

+462 −77

File changed.

Preview size limit exceeded, changes collapsed.

include/linux/input/ft5x06_ts.h

+9 −0
Original line number Diff line number Diff line
@@ -42,6 +42,14 @@ struct ft5x06_psensor_platform_data { 
	struct ft5x06_ts_data *data;

};



struct ft5x06_gesture_platform_data {

	int gesture_enable_to_set;	/* enable/disable gesture */

	int in_pocket;	/* whether in pocket mode or not */

	struct device *dev;

	struct class *gesture_class;

	struct ft5x06_ts_data *data;

};



struct ft5x06_ts_platform_data {

	struct fw_upgrade_info info;

	const char *name;
@@ -69,6 +77,7 @@ struct ft5x06_ts_platform_data { 
	bool i2c_pull_up;

	bool ignore_id_check;

	bool psensor_support;

	bool gesture_support;

	int (*power_init)(bool);

	int (*power_on)(bool);

};