summaryrefslogtreecommitdiff
path: root/drivers/input
diff options
context:
space:
mode:
authorXiaohui Tao <xtao@nvidia.com>2014-06-06 10:18:16 -0700
committerMandar Padmawar <mpadmawar@nvidia.com>2014-06-09 04:06:47 -0700
commit96ec201230966872c1c4b3b2197c6e457f0236e0 (patch)
treef6db24489aef97d6a6ceea9e5d3e7303ebf3172b /drivers/input
parent7b899e37a4b6afbdbc593a0e0322be039f4b9d53 (diff)
Revert "input: touch: raydium: Code drop V73.9"
This reverts commit 6c8f204fe29c074287147c7fcc3dfdbd61d038df. Change-Id: Ic688774004109ac2a8e977eb38fe934bbfac586f Signed-off-by: Xiaohui Tao <xtao@nvidia.com> Reviewed-on: http://git-master/r/420121 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Seema Khowala <seemaj@nvidia.com> Tested-by: Seema Khowala <seemaj@nvidia.com> GVS: Gerrit_Virtual_Submit Reviewed-by: Chao Xu <cxu@nvidia.com>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/touchscreen/rm31080a_ts.c31
1 files changed, 14 insertions, 17 deletions
diff --git a/drivers/input/touchscreen/rm31080a_ts.c b/drivers/input/touchscreen/rm31080a_ts.c
index 52586948f5be..b2d4e667a98c 100644
--- a/drivers/input/touchscreen/rm31080a_ts.c
+++ b/drivers/input/touchscreen/rm31080a_ts.c
@@ -397,6 +397,7 @@ void raydium_change_scan_mode(u8 u8_touch_count)
u16_nt_count_thd = (u16)g_st_ctrl.u8_time2idle * 100;
if (u8_touch_count) {
+
u32_no_touch_count = 0;
return;
}
@@ -521,8 +522,8 @@ void raydium_report_pointer(void *p)
u8_last_touch_count = sp_tp->uc_touch_count;
}
- /*if (g_st_ctrl.u8_power_mode)
- raydium_change_scan_mode(sp_tp->uc_touch_count); */
+ if (g_st_ctrl.u8_power_mode)
+ raydium_change_scan_mode(sp_tp->uc_touch_count);
kfree(sp_tp);
}
@@ -561,8 +562,8 @@ void raydium_report_pointer(void *p)
i_count = max(u8_last_touch_count, sp_tp->uc_touch_count);
if (!i_count) {
- /*if (g_st_ctrl.u8_power_mode)
- raydium_change_scan_mode(sp_tp->uc_touch_count);*/
+ if (g_st_ctrl.u8_power_mode)
+ raydium_change_scan_mode(sp_tp->uc_touch_count);
kfree(sp_tp);
return;
}
@@ -682,8 +683,8 @@ void raydium_report_pointer(void *p)
u8_last_touch_count = sp_tp->uc_touch_count;
input_sync(g_input_dev);
- /*if (g_st_ctrl.u8_power_mode)
- raydium_change_scan_mode(sp_tp->uc_touch_count);*/
+ if (g_st_ctrl.u8_power_mode)
+ raydium_change_scan_mode(sp_tp->uc_touch_count);
kfree(sp_tp);
}
@@ -1739,7 +1740,6 @@ static void rm_tch_init_ts_structure_part(void)
g_st_ts.b_init_finish = 0;
g_st_ts.b_calc_finish = 0;
g_st_ts.b_enable_scriber = 0;
- g_st_ts.b_is_suspended = 0;
#ifdef ENABLE_SLOW_SCAN
g_st_ts.b_enable_slow_scan = false;
#endif
@@ -1753,6 +1753,9 @@ static void rm_tch_init_ts_structure_part(void)
g_st_ts.u16_read_para = 0;
rm_ctrl_watchdog_func(0);
+ if (g_st_ts.b_is_suspended == false)
+ rm_tch_ctrl_init();
+ g_st_ts.b_is_suspended = 0;
b_bl_updated = false;
}
@@ -2008,7 +2011,7 @@ static ssize_t rm_tch_touchfile_check_show(struct device *dev,
struct device_attribute *attr,
char *buf)
{
- return sprintf(buf, "Touch calibration file check status: 0x%x\n",
+ return sprintf(buf, "0x%x\n",
g_st_ts.u8_touchfile_check);
}
@@ -2429,7 +2432,7 @@ static irqreturn_t rm_tch_irq(int irq, void *handle)
trace_touchscreen_raydium_irq("Raydium_interrupt");
- if (/*g_st_ctrl.u8_power_mode &&*/
+ if (g_st_ctrl.u8_power_mode &&
(g_st_ts.u8_scan_mode_state == RM_SCAN_IDLE_MODE)) {
input_event(g_input_dev, EV_MSC, MSC_ACTIVITY, 1);
#if (INPUT_PROTOCOL_CURRENT_SUPPORT == INPUT_PROTOCOL_TYPE_B)
@@ -2453,8 +2456,8 @@ static void rm_tch_enter_test_mode(u8 flag)
flush_workqueue(g_st_ts.rm_timer_workqueue);
} else { /*leave test mode*/
g_st_ts.b_selftest_enable = 0;
- g_st_ts.b_is_suspended = false;
rm_tch_init_ts_structure_part();
+ g_st_ts.b_is_suspended = false;
}
rm_tch_cmd_process(flag, g_st_rm_testmode_cmd, NULL);
@@ -2478,12 +2481,7 @@ void rm_tch_set_variable(unsigned int index, unsigned int arg)
g_st_ts.b_enable_scriber = (bool) arg;
break;
case RM_VARIABLE_AUTOSCAN_FLAG:
- /*g_st_ctrl.u8_power_mode = (bool) arg;*/
- if (g_st_ts.u8_scan_mode_state == RM_SCAN_ACTIVE_MODE) {
- mutex_lock(&g_st_ts.mutex_scan_mode);
- g_st_ts.u8_scan_mode_state = RM_SCAN_PRE_IDLE_MODE;
- mutex_unlock(&g_st_ts.mutex_scan_mode);
- }
+ g_st_ctrl.u8_power_mode = (bool) arg;
break;
case RM_VARIABLE_TEST_VERSION:
g_st_ts.u8_test_version = (u8) arg;
@@ -2625,7 +2623,6 @@ static void rm_tch_init_ts_structure(void)
g_st_ts.u8_resume_cnt = 0;
g_st_ts.u8_touchfile_check = 0xFF;
g_st_ts.u8_stylus_status = 0xFF;
- rm_tch_ctrl_init();
}
static int rm31080_voltage_notifier_1v8(struct notifier_block *nb,