Merge tag 'v4.4.3'

[firefly-linux-kernel-4.4.55.git] / drivers / input / touchscreen / ft5x0x_i2c_ts.h

diff --git a/drivers/input/touchscreen/ft5x0x_i2c_ts.h b/drivers/input/touchscreen/ft5x0x_i2c_ts.h
old mode 100644 (file)
new mode 100755 (executable)
index 10eb263..d15c8cf
--- a/drivers/input/touchscreen/ft5x0x_i2c_ts.h
+++ b/drivers/input/touchscreen/ft5x0x_i2c_ts.h
@@ -4,6 +4,8 @@
 //#define CONFIG_SUPPORT_FTS_CTP_UPG
 #define CONFIG_FTS_CUSTOME_ENV
 
+#define FT5X0X_I2C_SPEED 100*1000
+
 #define CFG_DBG_DUMMY_INFO_SUPPORT   1     //output touch point information
 #define CFG_DBG_FUCTION_INFO_SUPPORT 0     //output fouction name
 #define CFG_DBG_INPUT_EVENT                   0     //debug input event
@@ -13,6 +15,9 @@
 #define CFG_NUMOFKEYS                    0x4    //number of touch keys
 
 #ifdef CONFIG_FTS_CUSTOME_ENV  
+//µ±ÊÖÖ¸´Ó±ß½ç»®Æðʱ,»á³öÏÖÎÞÏìÓ¦µÄÇé¿ö,Òò´ËÌí¼ÓÒ»¸öºê½«±ß½ç×î´óÖµÏòÍâÀ­Éì
+#define SCREEN_BOUNDARY_ADJUST_VALUE 10 
+
 #define SCREEN_MAX_X           1024
 #define SCREEN_MAX_Y           600
 #else
@@ -80,12 +85,6 @@ typedef enum
     u8        touch_point;
 };
 
-struct FTS_TS_DATA_T {
-    struct input_dev    *input_dev;
-    struct FTS_TS_EVENT_T        event;
-    struct work_struct     pen_event_work;
-    struct workqueue_struct *ts_workqueue;
-};