diff options
| author | Jordan Nien <jnien@nvidia.com> | 2014-04-30 23:52:07 +0800 |
|---|---|---|
| committer | Mandar Padmawar <mpadmawar@nvidia.com> | 2014-05-14 07:04:28 -0700 |
| commit | d57945a76b2285a316e5bc22b1b6968e0c4d4a59 (patch) | |
| tree | e2ca528ae8a2d028472ad96d0ebf18bf75fb63f9 /drivers/input | |
| parent | de37408eb2d47ff39bba5fc646a7f00902925d88 (diff) | |
input: touch: raydium: update to 63.3
63.1 changelist:
[1] improve suspend/resume time.
[2] improve light touch.
[3] improve tool type switch.
[4] report multiple stylus points.
Change-Id: I44ed8ab6cae5e001ba26b711346aeec438d62815
Signed-off-by: Jordan Nien <jnien@nvidia.com>
Reviewed-on: http://git-master/r/403718
(cherry picked from commit 52b3b3cf2b7a8696ce1df3a767b0ac1cd6073176)
Reviewed-on: http://git-master/r/407527
Reviewed-by: Alex Chen <alchen@nvidia.com>
Tested-by: Alex Chen <alchen@nvidia.com>
Reviewed-by: Robert Collins <rcollins@nvidia.com>
Reviewed-by: Xiaohui Tao <xtao@nvidia.com>
Reviewed-by: Thomas Cherry <tcherry@nvidia.com>
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/touchscreen/rm31080a_ts.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/input/touchscreen/rm31080a_ts.c b/drivers/input/touchscreen/rm31080a_ts.c index f3fd5d8fa8d1..c16fb02260cc 100644 --- a/drivers/input/touchscreen/rm31080a_ts.c +++ b/drivers/input/touchscreen/rm31080a_ts.c @@ -780,7 +780,7 @@ int rm_tch_ctrl_wait_for_scan_finish(u8 u8Idx) if (g_st_ts.u16_read_para & 0x01) { if (u8Idx) - return 1; + return 0; else usleep_range(1000, 2000); /* msleep(1); */ } else @@ -1706,7 +1706,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 @@ -1721,7 +1720,9 @@ static void rm_tch_init_ts_structure_part(void) g_st_ts.u16_read_para = 0; rm_ctrl_watchdog_func(0); - rm_tch_ctrl_init(); + if(g_st_ts.b_is_suspended==false) + rm_tch_ctrl_init(); + g_st_ts.b_is_suspended = 0; b_bl_updated = false; } @@ -2920,6 +2921,7 @@ struct rm_tch_ts *rm_tch_input_init(struct device *dev, unsigned int irq, __set_bit(EV_KEY, input_dev->evbit); __set_bit(BTN_TOOL_RUBBER, input_dev->keybit); #else + __set_bit(EV_KEY, input_dev->evbit); __set_bit(EV_ABS, input_dev->evbit); input_set_abs_params(input_dev, ABS_MT_PRESSURE, 0, 0xFF, 0, 0); |