diff options
| author | davidycchen <davidycchen@google.com> | 2022-01-20 10:21:22 +0800 |
|---|---|---|
| committer | davidycchen <davidycchen@google.com> | 2022-01-20 11:17:01 +0800 |
| commit | 2fc89d19071d97860ce9c2931d3651f79a552750 (patch) | |
| tree | 6892acec9d5e3ad8252c3dab5bcc9cf979807de3 /syna_tcm2.c | |
| parent | b4bb87479b250cdc13f9c163f93343c3c6dccd45 (diff) | |
| download | synaptics_touch-2fc89d19071d97860ce9c2931d3651f79a552750.tar.gz | |
synaptics: let the driver retry for some cases
Add some retry mechanism for probe and resume functiom to let
the driver recover touch by itself.
Bug: 214087829
Bug: 214484327
Test: touch is workable.
Signed-off-by: davidycchen <davidycchen@google.com>
Change-Id: I5a800d746a9dd451074b8775f50a1c697ca1578f
Diffstat (limited to 'syna_tcm2.c')
| -rw-r--r-- | syna_tcm2.c | 39 |
1 files changed, 24 insertions, 15 deletions
diff --git a/syna_tcm2.c b/syna_tcm2.c index 46242a2..95b71e0 100644 --- a/syna_tcm2.c +++ b/syna_tcm2.c @@ -1319,7 +1319,8 @@ static int syna_pinctrl_configure(struct syna_tcm *tcm, bool enable) */ static int syna_dev_resume(struct device *dev) { - int retval; + int retval = 0; + int retry = 0; struct syna_tcm *tcm = dev_get_drvdata(dev); struct syna_hw_interface *hw_if = tcm->hw_if; bool irq_enabled = true; @@ -1340,23 +1341,30 @@ static int syna_dev_resume(struct device *dev) #ifdef RESET_ON_RESUME LOGI("Do reset on resume\n"); - syna_pal_sleep_ms(RESET_ON_RESUME_DELAY_MS); - if (hw_if->ops_hw_reset) { - hw_if->ops_hw_reset(hw_if); - retval = syna_tcm_get_event_data(tcm->tcm_dev, - &status, NULL); - if ((retval < 0) || (status != REPORT_IDENTIFY)) { - LOGE("Fail to complete hw reset\n"); - goto exit; - } - } else { - retval = syna_tcm_reset(tcm->tcm_dev); - if (retval < 0) { - LOGE("Fail to do sw reset\n"); - goto exit; + for (retry = 0; retry < 3; retry++) { + if (hw_if->ops_hw_reset) { + hw_if->ops_hw_reset(hw_if); + retval = syna_tcm_get_event_data(tcm->tcm_dev, + &status, NULL); + if ((retval < 0) || (status != REPORT_IDENTIFY)) { + LOGE("Fail to complete hw reset, ret = %d, status = %d\n", + retval, status); + continue; + } + break; + } else { + retval = syna_tcm_reset(tcm->tcm_dev); + if (retval < 0) { + LOGE("Fail to do sw reset, ret = %d\n", retval); + continue; + } + break; } } + if (retval < 0 || (hw_if->ops_hw_reset && (status != REPORT_IDENTIFY))) { + goto exit; + } #else #ifdef POWER_ALIVE_AT_SUSPEND /* enter normal power mode */ @@ -2086,6 +2094,7 @@ static int syna_dev_probe(struct platform_device *pdev) retval = tcm->dev_connect(tcm); if (retval < 0) { LOGE("Fail to connect to the device\n"); + retval = -EPROBE_DEFER; syna_pal_mutex_free(&tcm->tp_event_mutex); goto err_connect; } |