Revert "hlte: shutdown capative key when fbblanks"
This reverts commit 0ee1db5d1e73e8cbfb39df080ad1b84586914783.
Change-Id: I29c89a52ed3d7a5711cd7eec1de74adc86a0baca
diff --git a/drivers/input/keyboard/cypress_touchkey_h/cypress-touchkey.c b/drivers/input/keyboard/cypress_touchkey_h/cypress-touchkey.c
index 6fab151..75e6915 100755
--- a/drivers/input/keyboard/cypress_touchkey_h/cypress-touchkey.c
+++ b/drivers/input/keyboard/cypress_touchkey_h/cypress-touchkey.c
@@ -69,7 +69,7 @@
#define CYPRESS_FW_ID_REG 0X05
-//#define USE_OPEN_CLOSE
+#define USE_OPEN_CLOSE
#undef DO_NOT_USE_FUNC_PARAM
#define KEYCODE_REG 0x00
@@ -93,9 +93,7 @@
static void cypress_touchkey_early_suspend(struct early_suspend *h);
static void cypress_touchkey_late_resume(struct early_suspend *h);
#endif
-static int fb_notifier_callback(struct notifier_block *self,
- unsigned long event, void *data);
-static void configure_sleep(struct cypress_touchkey_info *info);
+
#ifdef TK_INFORM_CHARGER
extern void touchkey_register_callback(void *cb);
#endif
@@ -125,7 +123,6 @@
};
#endif
-
#ifdef TSP_BOOSTER
static void cypress_change_dvfs_lock(struct work_struct *work)
{
@@ -144,7 +141,6 @@
mutex_unlock(&info->dvfs_lock);
}
-
static void cypress_set_dvfs_off(struct work_struct *work)
{
struct cypress_touchkey_info *info =
@@ -1866,10 +1862,6 @@
register_early_suspend(&info->early_suspend);
#endif /* CONFIG_HAS_EARLYSUSPEND */
-#ifdef CONFIG_FB
- configure_sleep(info);
-#endif
-
#if defined(CONFIG_GLOVE_TOUCH)
info->glove_wq = create_singlethread_workqueue("cypress_touchkey");
if (!info->glove_wq)
@@ -2027,39 +2019,6 @@
}
#endif
-#if defined(CONFIG_FB)
-static int fb_notifier_callback(struct notifier_block *self,
- unsigned long event, void *data)
- {
- struct fb_event *evdata = data;
- int *blank;
- struct cypress_touchkey_info *info =
- container_of(self, struct cypress_touchkey_info, fb_notif);
-
- if (evdata && evdata->data && event == FB_EVENT_BLANK &&
- info && info->client) {
- blank = evdata->data;
- if (*blank == FB_BLANK_UNBLANK)
- cypress_touchkey_resume(&info->client->dev);
- else if (*blank == FB_BLANK_POWERDOWN)
- cypress_touchkey_suspend(&info->client->dev);
- }
-
- return 0;
- }
-
-static void configure_sleep(struct cypress_touchkey_info *info)
- {
- int retval = 0;
- info->fb_notif.notifier_call = fb_notifier_callback;
- retval = fb_register_client(&info->fb_notif);
- if (retval)
- dev_err(&info->client->dev,
- "Unable to register fb_notifier: %d\n", retval);
- return;
- }
-#endif
-
#ifdef CONFIG_HAS_EARLYSUSPEND
static void cypress_touchkey_early_suspend(struct early_suspend *h)
{
diff --git a/include/linux/i2c/touchkey_i2c.h b/include/linux/i2c/touchkey_i2c.h
index 7fa9d4d..761e98b 100755
--- a/include/linux/i2c/touchkey_i2c.h
+++ b/include/linux/i2c/touchkey_i2c.h
@@ -32,10 +32,6 @@
#include <linux/input.h>
#include <linux/earlysuspend.h>
#include <linux/mutex.h>
-#ifdef CONFIG_FB
-#include <linux/notifier.h>
-#include <linux/fb.h>
-#endif
#if defined(CONFIG_GLOVE_TOUCH)
#define TK_BIT_GLOVE 0x40
@@ -131,9 +127,6 @@
struct i2c_client *client;
struct cypress_touchkey_platform_data *pdata;
struct input_dev *input_dev;
-#ifdef CONFIG_FB
- struct notifier_block fb_notif;
-#endif
struct early_suspend early_suspend;
char phys[32];
unsigned char keycode[NUM_OF_KEY];