From b011085af6451b78ae46506c2e2932217d35a646 Mon Sep 17 00:00:00 2001 From: litong Date: Tue, 17 Mar 2020 18:57:21 +0800 Subject: [PATCH] Solve the problem of I2C error when power off 1. In case of touch power off, upper layer access node to set pill_region and suppression, which generate I2C error. 2. Set power state when power on and power off. Change-Id: I147c6aacbf215ecba431f9ee15e8a955e346155b Reviewed-on: https://gerrit.mot.com/1514772 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Konstantin Makariev Submit-Approved: Jira Key --- drivers/input/touchscreen/sec_mmi/sec_ts.h | 3 + .../touchscreen/sec_mmi/sec_ts_mmi_class.c | 91 +++++++++++++++++++ 2 files changed, 94 insertions(+) diff --git a/drivers/input/touchscreen/sec_mmi/sec_ts.h b/drivers/input/touchscreen/sec_mmi/sec_ts.h index f6a5e6435d89..07c51cc5c5bc 100644 --- a/drivers/input/touchscreen/sec_mmi/sec_ts.h +++ b/drivers/input/touchscreen/sec_mmi/sec_ts.h @@ -711,6 +711,9 @@ struct sec_ts_data { unsigned char pressure_cal_base; unsigned char pressure_cal_delta; + unsigned char suppression_data; + unsigned char pill_region_data[5]; + unsigned char hold_distance_data; /* for factory - factory_cmd_result_all() */ short cm_raw_set_p2p_min; //CM_RAW_SET_P2P diff --git a/drivers/input/touchscreen/sec_mmi/sec_ts_mmi_class.c b/drivers/input/touchscreen/sec_mmi/sec_ts_mmi_class.c index 58b7ff14e847..19b32b63c418 100644 --- a/drivers/input/touchscreen/sec_mmi/sec_ts_mmi_class.c +++ b/drivers/input/touchscreen/sec_mmi/sec_ts_mmi_class.c @@ -231,6 +231,12 @@ static ssize_t sec_mmi_suppression_store(struct device *dev, buffer = (unsigned char)value; dev_dbg(dev, "%s: program value 0x%02x\n", __func__, (unsigned int)buffer); + if (ts->power_status == SEC_TS_STATE_POWER_OFF) { + dev_dbg(dev, "%s: power off state\n", __func__); + ts->suppression_data = buffer; + return size; + } + error = ts->sec_ts_i2c_write(ts, SEC_TS_GRIP_SUPPRESSION_INFO, &buffer, sizeof(buffer)); if (error < 0) dev_err(dev, "%s: failed to write suppression info (%d)\n", @@ -257,6 +263,11 @@ static ssize_t sec_mmi_suppression_show(struct device *dev, dev = MMI_DEV_TO_TS_DEV(dev); GET_TS_DATA(dev); + if (ts->power_status == SEC_TS_STATE_POWER_OFF) { + dev_dbg(dev, "%s: power off state\n", __func__); + blen += scnprintf(buf, PAGE_SIZE, "0x%02x", (unsigned int)(ts->suppression_data)); + return blen; + } error = ts->sec_ts_i2c_read(ts, SEC_TS_GRIP_SUPPRESSION_INFO, &buffer, sizeof(buffer)); if (error < 0) dev_err(dev, "%s: failed to read suppression info (%d)\n", @@ -295,6 +306,12 @@ static ssize_t sec_mmi_pill_region_store(struct device *dev, (unsigned int)buffer[2], (unsigned int)buffer[3], (unsigned int)buffer[4]); + if (ts->power_status == SEC_TS_STATE_POWER_OFF) { + dev_dbg(dev, "%s: power off state\n", __func__); + memcpy(ts->pill_region_data, buffer, sizeof(ts->pill_region_data)); + return size; + } + error = ts->sec_ts_i2c_write(ts, SEC_TS_CMD_PILL_REGION, buffer, sizeof(buffer)); if (error < 0) dev_err(dev, "%s: failed to write pill region (%d)\n", @@ -325,6 +342,14 @@ static ssize_t sec_mmi_pill_region_show(struct device *dev, dev = MMI_DEV_TO_TS_DEV(dev); GET_TS_DATA(dev); + if (ts->power_status == SEC_TS_STATE_POWER_OFF) { + dev_dbg(dev, "%s: power off state\n", __func__); + memcpy(buffer, ts->pill_region_data, sizeof(buffer)); + blen += scnprintf(buf, PAGE_SIZE, "0x%02x 0x%x 0x%x", (unsigned int)buffer[0], + (unsigned int)buffer[2] | (buffer[1] << 8), + (unsigned int)buffer[4] | (buffer[3] << 8)); + return blen; + } error = ts->sec_ts_i2c_read(ts, SEC_TS_CMD_PILL_REGION, buffer, sizeof(buffer)); if (error < 0) dev_err(dev, "%s: failed to read pill region (%d)\n", @@ -361,6 +386,12 @@ static ssize_t sec_mmi_hold_distance_store(struct device *dev, buffer = (unsigned char)value; dev_dbg(dev, "%s: program value 0x%02x\n", __func__, (unsigned int)buffer); + if (ts->power_status == SEC_TS_STATE_POWER_OFF) { + dev_dbg(dev, "%s: power off state\n", __func__); + ts->hold_distance_data = buffer; + return size; + } + error = ts->sec_ts_i2c_write(ts, SEC_TS_CMD_HOLD_DISTANCE, &buffer, sizeof(buffer)); if (error < 0) dev_err(dev, "%s: failed to write hold distance (%d)\n", @@ -380,6 +411,12 @@ static ssize_t sec_mmi_hold_distance_show(struct device *dev, dev = MMI_DEV_TO_TS_DEV(dev); GET_TS_DATA(dev); + if (ts->power_status == SEC_TS_STATE_POWER_OFF) { + dev_dbg(dev, "%s: power off state\n", __func__); + blen += scnprintf(buf, PAGE_SIZE, "0x%02x", (unsigned int)(ts->hold_distance_data)); + return blen; + } + error = ts->sec_ts_i2c_read(ts, SEC_TS_CMD_HOLD_DISTANCE, &buffer, sizeof(buffer)); if (error < 0) dev_err(dev, "%s: failed to read hold distance info (%d)\n", @@ -686,6 +723,11 @@ static int sec_mmi_methods_power(struct device *dev, int on) { return -ENODEV; } + if (on) + ts->power_status = SEC_TS_STATE_POWER_ON; + else + ts->power_status = SEC_TS_STATE_POWER_OFF; + return sec_ts_power((void *)ts, on == TS_MMI_POWER_ON); } @@ -873,6 +915,30 @@ static int sec_mmi_post_resume(struct device *dev) { if (ts->lowpower_mode) complete_all(&ts->resume_done); + if (ts->plat_data->suppression_ctrl) { + ret = ts->sec_ts_i2c_read(ts, SEC_TS_GRIP_SUPPRESSION_INFO, + &ts->suppression_data, sizeof(ts->suppression_data)); + if (ret < 0) + dev_err(dev, "%s: failed to write suppression info (%d)\n", + __func__, ret); + } + + if(ts->plat_data->pill_region_ctrl) { + ret = ts->sec_ts_i2c_read(ts, SEC_TS_CMD_PILL_REGION, + ts->pill_region_data, sizeof(ts->pill_region_data)); + if (ret < 0) + dev_err(dev, "%s: failed to write pill region (%d)\n", + __func__, ret); + } + + if(ts->plat_data->hold_distance_ctrl) { + ret = ts->sec_ts_i2c_read(ts, SEC_TS_CMD_HOLD_DISTANCE, + &ts->hold_distance_data, sizeof(ts->hold_distance_data)); + if (ret < 0) + dev_err(dev, "%s: failed to write hold distance (%d)\n", + __func__, ret); + } + ret = ts->sec_ts_i2c_read(ts, SEC_TS_READ_BOOT_STATUS, &buffer, sizeof(buffer)); if (ret < 0) @@ -980,6 +1046,31 @@ int sec_mmi_data_init(struct sec_ts_data *ts, bool enable) ts->device_id[3] = 0x7C; sec_mmi_class_fname(ts); + + /*initialize value*/ + if (ts->plat_data->suppression_ctrl) { + ret = ts->sec_ts_i2c_read(ts, SEC_TS_GRIP_SUPPRESSION_INFO, + &ts->suppression_data, sizeof(ts->suppression_data)); + if (ret < 0) + dev_err(&ts->client->dev, "%s: failed to write suppression info (%d)\n", + __func__, ret); + } + + if(ts->plat_data->pill_region_ctrl) { + ret = ts->sec_ts_i2c_read(ts, SEC_TS_CMD_PILL_REGION, + ts->pill_region_data, sizeof(ts->pill_region_data)); + if (ret < 0) + dev_err(&ts->client->dev, "%s: failed to write pill region (%d)\n", + __func__, ret); + } + + if(ts->plat_data->hold_distance_ctrl) { + ret = ts->sec_ts_i2c_read(ts, SEC_TS_CMD_HOLD_DISTANCE, + &ts->hold_distance_data, sizeof(ts->hold_distance_data)); + if (ret < 0) + dev_err(&ts->client->dev, "%s: failed to write pill region (%d)\n", + __func__, ret); + } } else ts_mmi_dev_unregister(&ts->client->dev);