From 36d72137304c002dc35cb7710163d1f9255b14cf Mon Sep 17 00:00:00 2001 From: Wangqiang Guo Date: Fri, 10 Mar 2023 02:24:53 +0000 Subject: [PATCH] input: touchscreen: gt1x: close auto update for GKI. Change-Id: I81c7275240e3548b7d0566f53c3be8b6a25da96b Signed-off-by: Wangqiang Guo --- drivers/input/touchscreen/gt1x/gt1x_generic.c | 8 +++-- drivers/input/touchscreen/gt1x/gt1x_update.c | 30 +++++++++++++++---- 2 files changed, 30 insertions(+), 8 deletions(-) diff --git a/drivers/input/touchscreen/gt1x/gt1x_generic.c b/drivers/input/touchscreen/gt1x/gt1x_generic.c index 4cb0d2e869a6..132fabdd6f9f 100644 --- a/drivers/input/touchscreen/gt1x/gt1x_generic.c +++ b/drivers/input/touchscreen/gt1x/gt1x_generic.c @@ -243,7 +243,7 @@ static ssize_t gt1x_debug_write_proc(struct file *file, const char *buffer, size gt1x_update_firmware(arg1); return count; } - +#if 0 //close for GKI if (strcmp(mode_str, "sendconfig") == 0) { cfg_len = gt1x_parse_config(arg1, temp_config); if (cfg_len < 0) { @@ -252,7 +252,7 @@ static ssize_t gt1x_debug_write_proc(struct file *file, const char *buffer, size gt1x_send_cfg(temp_config, gt1x_cfg_length); return count; } - +#endif if (strcmp(mode_str, "debug_gesture") == 0) { #if GTP_GESTURE_WAKEUP gt1x_gesture_debug(!!mode); @@ -266,7 +266,7 @@ static ssize_t gt1x_debug_write_proc(struct file *file, const char *buffer, size } #endif -static u8 ascii2hex(u8 a) +static u8 __maybe_unused ascii2hex(u8 a) { s8 value = 0; if (a >= '0' && a <= '9') { @@ -281,6 +281,7 @@ static u8 ascii2hex(u8 a) return value; } +#if 0 //close for GKI int gt1x_parse_config(char *filename, u8 *config) { mm_segment_t old_fs; @@ -357,6 +358,7 @@ parse_cfg_fail1: return cur_len; } +#endif s32 _do_i2c_read(struct i2c_msg *msgs, u16 addr, u8 *buffer, s32 len) { diff --git a/drivers/input/touchscreen/gt1x/gt1x_update.c b/drivers/input/touchscreen/gt1x/gt1x_update.c index 0979bb32d52f..86ce71c7aa1c 100644 --- a/drivers/input/touchscreen/gt1x/gt1x_update.c +++ b/drivers/input/touchscreen/gt1x/gt1x_update.c @@ -137,7 +137,7 @@ struct fw_update_info update_info = { .force_update = 0 }; -int gt1x_update_prepare(char *filename); +// int gt1x_update_prepare(char *filename); int gt1x_check_firmware(void); u8 *gt1x_get_fw_data(u32 offset, int length); int gt1x_update_judge(void); @@ -149,13 +149,13 @@ void gt1x_update_cleanup(void); int gt1x_check_subsystem_in_flash(struct fw_subsystem_info *subsystem); int gt1x_read_flash(u32 addr, int length); int gt1x_error_erase(void); -void dump_to_file(u16 addr, int length, char *filepath); +// void dump_to_file(u16 addr, int length, char *filepath); int gt1x_update_firmware(void *filename); int gt1x_auto_update_proc(void *data); #if !GTP_HEADER_FW_UPDATE -static int gt1x_search_update_files(void); +// static int gt1x_search_update_files(void); #endif int gt1x_hold_ss51_dsp(void); @@ -165,6 +165,7 @@ void gt1x_leave_update_mode(void); * @return: return 0 if success, otherwise return a negative number * which contains the error code. */ +#if 0 //close for GKI s32 gt1x_check_fs_mounted(char *path_name) { struct path root_path; @@ -193,6 +194,7 @@ check_fs_fail: path_put(&root_path); return err; } +#endif int gt1x_i2c_write_with_readback(u16 addr, u8 *buffer, int length) { @@ -226,7 +228,13 @@ u32 getUint(u8 *buffer, int len) int gt1x_auto_update_proc(void *data) { - +/* auto update from /data/_goodix_update_.bin + * Does not meet the gki standard. + * close auto update function. + */ + GTP_ERROR("auto update failed! return\n"); + return 0; +#if 0 #if GTP_HEADER_FW_UPDATE GTP_INFO("Start auto update thread..."); gt1x_update_firmware(NULL); @@ -263,8 +271,9 @@ int gt1x_auto_update_proc(void *data) } #endif return 0; +#endif } -#if !GTP_HEADER_FW_UPDATE +#if 0 //!GTP_HEADER_FW_UPDATE static int gt1x_search_update_files(void) { /*wait 10s(max) if fs is not ready*/ @@ -338,6 +347,12 @@ void gt1x_enter_update_mode(void) int gt1x_update_firmware(void *filename) { +/* + * gt1x update firmware doesn't meet gki + */ + GTP_ERROR("gt1x update firmware failed\n"); + return 0; +#if 0 int i = 0; int ret = 0; u8 *p; @@ -461,8 +476,10 @@ gt1x_update_exit: } GTP_INFO("Update firmware succeefully!"); return ret; +#endif } +#if 0 //close for GKI int gt1x_update_prepare(char *filename) { int ret = 0; @@ -533,6 +550,7 @@ gt1x_update_pre_fail1: filp_close(update_info.fw_file, NULL); return ret; } +#endif void gt1x_update_cleanup(void) { @@ -1303,6 +1321,7 @@ void gt1x_leave_update_mode(void) gt1x_irq_enable(); } +#if 0 //close for GKI void dump_to_file(u16 addr, int length, char *filepath) { struct file *flp = NULL; @@ -1330,6 +1349,7 @@ void dump_to_file(u16 addr, int length, char *filepath) } filp_close(flp, NULL); } +#endif int gt1x_hold_ss51_dsp_no_reset(void) {