aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/touchscreen
diff options
context:
space:
mode:
authorDaniel Hillenbrand <codeworkx@cyanogenmod.org>2013-08-23 21:54:03 +0200
committerDaniel Hillenbrand <codeworkx@cyanogenmod.org>2013-08-23 21:56:19 +0200
commita64df5bd240324b9551cffbf9171888ccaa3fdeb (patch)
treeb1fdab28526549dbbb55968b6c8f329a64cd8a53 /drivers/input/touchscreen
parentb07657a606584eb7328c10d6f57fbb0f0db6d070 (diff)
downloadkernel_samsung_smdk4412-a64df5bd240324b9551cffbf9171888ccaa3fdeb.zip
kernel_samsung_smdk4412-a64df5bd240324b9551cffbf9171888ccaa3fdeb.tar.gz
kernel_samsung_smdk4412-a64df5bd240324b9551cffbf9171888ccaa3fdeb.tar.bz2
cypress-touchkey: remove backlight timeout feature
Userspace implementation: http://review.cyanogenmod.org/48796 http://review.cyanogenmod.org/48872 http://review.cyanogenmod.org/48884 Change-Id: Id4ac50168220310e82aa4aae367dad4e72e3a9c3
Diffstat (limited to 'drivers/input/touchscreen')
-rw-r--r--drivers/input/touchscreen/mms152_ts.c34
-rw-r--r--drivers/input/touchscreen/mms_ts.c9
-rw-r--r--drivers/input/touchscreen/mxt224_u1.c6
3 files changed, 0 insertions, 49 deletions
diff --git a/drivers/input/touchscreen/mms152_ts.c b/drivers/input/touchscreen/mms152_ts.c
index ad1dc98..fa1d295 100644
--- a/drivers/input/touchscreen/mms152_ts.c
+++ b/drivers/input/touchscreen/mms152_ts.c
@@ -49,8 +49,6 @@
#include <asm/unaligned.h>
-#include "../keyboard/cypress/cypress-touchkey.h"
-
#ifdef CONFIG_INPUT_FBSUSPEND
#ifdef CONFIG_DRM
#include <drm/drm_backlight.h>
@@ -977,10 +975,6 @@ static irqreturn_t mms_ts_interrupt(int irq, void *dev_id)
if (info->panel == 'M') {
if (info->finger_state[id] != 0) {
info->finger_state[id] = 0;
-
- // report state to cypress-touchkey for backlight timeout
- touchscreen_state_report(0);
-
#ifdef CONFIG_LCD_FREQ_SWITCH
dev_notice(&client->dev,
"R(%c)(%d) [%2d]", info->ldi,
@@ -994,10 +988,6 @@ static irqreturn_t mms_ts_interrupt(int irq, void *dev_id)
} else {
if (info->finger_state[id] != 0) {
info->finger_state[id] = 0;
-
- // report state to cypress-touchkey for backlight timeout
- touchscreen_state_report(0);
-
dev_notice(&client->dev,
"R [%2d]", id);
}
@@ -1006,10 +996,6 @@ static irqreturn_t mms_ts_interrupt(int irq, void *dev_id)
if (info->panel == 'M') {
if (info->finger_state[id] != 0) {
info->finger_state[id] = 0;
-
- // report state to cypress-touchkey for backlight timeout
- touchscreen_state_report(0);
-
#ifdef CONFIG_LCD_FREQ_SWITCH
dev_notice(&client->dev,
"R(%c)(%d) [%2d],([%4d],[%3d])",
@@ -1025,10 +1011,6 @@ static irqreturn_t mms_ts_interrupt(int irq, void *dev_id)
} else {
if (info->finger_state[id] != 0) {
info->finger_state[id] = 0;
-
- // report state to cypress-touchkey for backlight timeout
- touchscreen_state_report(0);
-
dev_notice(&client->dev,
"R [%2d],([%4d],[%3d]),S:%d W:%d",
id, x, y, tmp[4], tmp[5]);
@@ -1058,10 +1040,6 @@ static irqreturn_t mms_ts_interrupt(int irq, void *dev_id)
#ifdef CONFIG_SAMSUNG_PRODUCT_SHIP
if (info->finger_state[id] == 0) {
info->finger_state[id] = 1;
-
- // report state to cypress-touchkey for backlight timeout
- touchscreen_state_report(1);
-
#ifdef CONFIG_LCD_FREQ_SWITCH
dev_notice(&client->dev,
"P(%c)(%d) [%2d]", info->ldi,
@@ -1074,10 +1052,6 @@ static irqreturn_t mms_ts_interrupt(int irq, void *dev_id)
#else
if (info->finger_state[id] == 0) {
info->finger_state[id] = 1;
-
- // report state to cypress-touchkey for backlight timeout
- touchscreen_state_report(1);
-
#ifdef CONFIG_LCD_FREQ_SWITCH
dev_notice(&client->dev,
"P(%c)(%d) [%2d],([%4d],[%3d]) w=%d, major=%d, minor=%d, angle=%d, palm=%d",
@@ -1108,20 +1082,12 @@ static irqreturn_t mms_ts_interrupt(int irq, void *dev_id)
#ifdef CONFIG_SAMSUNG_PRODUCT_SHIP
if (info->finger_state[id] == 0) {
info->finger_state[id] = 1;
-
- // report state to cypress-touchkey for backlight timeout
- touchscreen_state_report(1);
-
dev_notice(&client->dev,
"P [%2d]", id);
}
#else
if (info->finger_state[id] == 0) {
info->finger_state[id] = 1;
-
- // report state to cypress-touchkey for backlight timeout
- touchscreen_state_report(1);
-
dev_notice(&client->dev,
"P [%2d],([%4d],[%3d]),S:%d W:%d",
id, x, y, tmp[4], tmp[5]);
diff --git a/drivers/input/touchscreen/mms_ts.c b/drivers/input/touchscreen/mms_ts.c
index ebca68c..cdb47f7 100644
--- a/drivers/input/touchscreen/mms_ts.c
+++ b/drivers/input/touchscreen/mms_ts.c
@@ -50,8 +50,6 @@
#include <asm/unaligned.h>
-#include "../keyboard/cypress/cypress-touchkey.h"
-
#define MAX_FINGERS 10
#define MAX_WIDTH 30
#define MAX_PRESSURE 255
@@ -682,9 +680,6 @@ static irqreturn_t mms_ts_interrupt(int irq, void *dev_id)
, angle, palm);
#else
if (info->finger_state[id] != 0) {
- // report state to cypress-touchkey for backlight timeout
- touchscreen_state_report(0);
-
dev_notice(&client->dev,
"finger [%d] up, palm %d\n", id, palm);
}
@@ -723,10 +718,6 @@ static irqreturn_t mms_ts_interrupt(int irq, void *dev_id)
#else
if (info->finger_state[id] == 0) {
info->finger_state[id] = 1;
-
- // report state to cypress-touchkey for backlight timeout
- touchscreen_state_report(1);
-
dev_notice(&client->dev,
"finger [%d] down, palm %d\n", id, palm);
}
diff --git a/drivers/input/touchscreen/mxt224_u1.c b/drivers/input/touchscreen/mxt224_u1.c
index cd0674f..5a243fb 100644
--- a/drivers/input/touchscreen/mxt224_u1.c
+++ b/drivers/input/touchscreen/mxt224_u1.c
@@ -28,8 +28,6 @@
#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
@@ -1339,10 +1337,6 @@ 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)