A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-11 15:11:48 -04:00
Code Issues Projects Releases Packages Wiki Activity

Modify the config id and build id

Browse source 
1. Modify the config id to touch class common time format.
2. The reset operation has been performed after powe on,
so delete the redundate reset operation.

Change-Id: Ia93c8491c62f51d7effc56479462bb90a7a43c9f
Reviewed-on: https://gerrit.mot.com/2075360
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Jichao Zou <zoujc@motorola.com>
Submit-Approved: Jira Key
This commit is contained in:
litong20 2021-10-11 18:04:12 +08:00 • committed by litong
commit dc8be450b4
2 changed files with 22 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

5
drivers/input/touchscreen/goodix_berlin_mmi/goodix_brl_hw.c
View file

@ -851,8 +851,9 @@ static void print_ic_info(struct goodix_ic_info *ic_info)
version->frame_data_version_id);
ts_info("touch_data_customer_id: 0x%01X",
version->touch_data_customer_id);
ts_info("touch_data_version_id: 0x%01X",
version->touch_data_version_id);
ts_info("touch_data_version_id: %02x%02x%02x%02x",
version->touch_data_version_id, version->reserved[0],
version->reserved[1], version->reserved[2]);
ts_info("freqhop_feature: 0x%04X",
feature->freqhop_feature);

35
drivers/input/touchscreen/goodix_berlin_mmi/goodix_ts_mmi.c
View file

@ -49,38 +49,44 @@ static int goodix_ts_mmi_methods_get_productinfo(struct device *dev, void *cdata
fw_version.patch_pid);
}
#define TOUCH_CFG_VERSION_ADDR 0x10076
static int goodix_ts_mmi_methods_get_build_id(struct device *dev, void *cdata) {
int ret;
struct platform_device *pdev;
struct goodix_ts_core *core_data;
u32 cfg_id;
GET_GOODIX_DATA(dev);
ret = core_data->hw_ops->get_ic_info(core_data, &core_data->ic_info, false);
if (!ret) {
ret = snprintf(TO_CHARP(cdata), TS_MMI_MAX_ID_LEN,
"%08x", core_data->ic_info.version.config_id);
return ret;
} else
ret = core_data->hw_ops->read(core_data, TOUCH_CFG_VERSION_ADDR,
(u8*)&cfg_id, sizeof(cfg_id));
if (ret) {
ts_info("failed get fw version data, %d", ret);
return -EINVAL;
}
return snprintf(TO_CHARP(cdata), TS_MMI_MAX_ID_LEN, "%04x", le32_to_cpu(cfg_id));
}
#define TOUCH_FW_VERSION_ADDR 0x1007E
/*return firmware version*/
static int goodix_ts_mmi_methods_get_config_id(struct device *dev, void *cdata) {
int ret;
struct platform_device *pdev;
struct goodix_ts_core *core_data;
struct goodix_fw_version chip_ver;
u8 fw_id[4] = {0};
GET_GOODIX_DATA(dev);
ret = core_data->hw_ops->read_version(core_data, &chip_ver, false);
if (!ret) {
ret = snprintf(TO_CHARP(cdata), TS_MMI_MAX_ID_LEN,
"%02x%02x", chip_ver.patch_vid[2], chip_ver.patch_vid[3]);
return ret;
} else
ret = core_data->hw_ops->read(core_data, TOUCH_FW_VERSION_ADDR,
fw_id, sizeof(fw_id));
if (ret) {
ts_info("failed get fw version data, %d", ret);
return -EINVAL;
}
return snprintf(TO_CHARP(cdata), TS_MMI_MAX_ID_LEN, "%02x%02x%02x%02x",
fw_id[0], fw_id[1], fw_id[2], fw_id[3]);
}
static int goodix_ts_mmi_methods_get_bus_type(struct device *dev, void *idata) {
@ -254,9 +260,6 @@ static int goodix_ts_mmi_pre_resume(struct device *dev) {
if (core_data->gesture_enabled)
disable_irq_wake(core_data->irq);
if (hw_ops->resume)
hw_ops->resume(core_data);
return 0;
}