diff options
| author | Daniel Hillenbrand <codeworkx@cyanogenmod.org> | 2013-05-25 10:53:54 +0200 |
|---|---|---|
| committer | Daniel Hillenbrand <codeworkx@cyanogenmod.org> | 2013-05-25 10:53:54 +0200 |
| commit | 05f0203060035bd2cb8c8f98b8b466b934b1c45b (patch) | |
| tree | 051a8c9d1a431b27fb5d4fecaf5417487857a400 /drivers/input/touchscreen/mxt224_u1.c | |
| parent | ab6dfccd8d126b50059d39d031cfa1ddc8f32b84 (diff) | |
| download | kernel_samsung_smdk4412-05f0203060035bd2cb8c8f98b8b466b934b1c45b.zip kernel_samsung_smdk4412-05f0203060035bd2cb8c8f98b8b466b934b1c45b.tar.gz kernel_samsung_smdk4412-05f0203060035bd2cb8c8f98b8b466b934b1c45b.tar.bz2 | |
u1: import from CyanogenMod/android_kernel_samsung_smdk4210
Change-Id: I9629a4060538c9c4c6a43a86a56826cd7123d1b5
Diffstat (limited to 'drivers/input/touchscreen/mxt224_u1.c')
| -rw-r--r-- | drivers/input/touchscreen/mxt224_u1.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/mxt224_u1.c b/drivers/input/touchscreen/mxt224_u1.c index f4368e8..ffda78f 100644 --- a/drivers/input/touchscreen/mxt224_u1.c +++ b/drivers/input/touchscreen/mxt224_u1.c @@ -28,6 +28,8 @@ #include <mach/cpufreq.h> #include <linux/input/mt.h> +#include "../keyboard/cypress/cypress-touchkey.h" + #define OBJECT_TABLE_START_ADDRESS 7 #define OBJECT_TABLE_ELEMENT_SIZE 6 @@ -187,7 +189,7 @@ struct mxt224_data { bool median_err_flag; int touch_is_pressed_arr[MAX_USING_FINGER_NUM]; -#if defined(CONFIG_TARGET_LOCALE_NAATT) +#if defined(CONFIG_TARGET_LOCALE_NAATT) || defined(CONFIG_TARGET_LOCALE_NAATT_TEMP) bool gain_change_flag; int gain_ta; #endif @@ -1337,6 +1339,10 @@ static void report_input_data(struct mxt224_data *data) copy_data->lock_status = 1; } } + + /* tell cypress keypad we had finger activity */ + touchscreen_state_report(touch_is_pressed); + } void palm_recovery(void) |