diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-09-02 13:52:49 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-09-02 13:52:49 -0700 |
| commit | c1786b559a8b6002731003624355737c03f556ae (patch) | |
| tree | d00300473aeca36c53d53d2c9efef87a5a540126 /include/linux/input | |
| parent | 1e7b2ab2a992be8bd276fa37302a1b9f73de54f6 (diff) | |
| parent | d0d1f78347ce9755da60335549e5ced1a5775ca3 (diff) | |
Merge "input: ft5x06_ts: remove proximity sensor support"
Diffstat (limited to 'include/linux/input')
| -rw-r--r-- | include/linux/input/ft5x06_ts.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/linux/input/ft5x06_ts.h b/include/linux/input/ft5x06_ts.h index bd37af71fe0d..3825f9d1e68c 100644 --- a/include/linux/input/ft5x06_ts.h +++ b/include/linux/input/ft5x06_ts.h @@ -34,11 +34,11 @@ struct fw_upgrade_info { u16 delay_erase_flash; }; -struct ft5x06_psensor_platform_data { - struct input_dev *input_psensor_dev; - struct sensors_classdev ps_cdev; - int tp_psensor_opened; - char tp_psensor_data; /* 0 near, 1 far */ +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; }; @@ -68,7 +68,7 @@ struct ft5x06_ts_platform_data { bool no_force_update; bool i2c_pull_up; bool ignore_id_check; - bool psensor_support; + bool gesture_support; int (*power_init)(bool); int (*power_on)(bool); }; |
