diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-08-26 22:22:21 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-08-26 22:22:20 -0700 |
| commit | 1c416b0f74c03b0a5321604e206e2e3ce22f8f21 (patch) | |
| tree | 23df1b08a09f3105c9aec03d454522d66a8e53bc /include/linux | |
| parent | 02592fae06a3b3f5d68ae168e573c1f39777953c (diff) | |
| parent | fd296540aeaf0e8c0de20bec92ef66e8ecbdc9b9 (diff) | |
Merge "input: ft5x06_ts: add proximity feature support"
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/input/ft5x06_ts.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/include/linux/input/ft5x06_ts.h b/include/linux/input/ft5x06_ts.h index 1340737070f7..bd37af71fe0d 100644 --- a/include/linux/input/ft5x06_ts.h +++ b/include/linux/input/ft5x06_ts.h @@ -22,6 +22,7 @@ #define FT5X16_ID 0x0A #define FT5X36_ID 0x14 #define FT6X06_ID 0x06 +#define FT6X36_ID 0x36 struct fw_upgrade_info { bool auto_cal; @@ -33,6 +34,14 @@ 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_ts_data *data; +}; + struct ft5x06_ts_platform_data { struct fw_upgrade_info info; const char *name; @@ -59,6 +68,7 @@ struct ft5x06_ts_platform_data { bool no_force_update; bool i2c_pull_up; bool ignore_id_check; + bool psensor_support; int (*power_init)(bool); int (*power_on)(bool); }; |