From 6ee566fa01247d9c4c222601c2bd99534f9d66f9 Mon Sep 17 00:00:00 2001 From: electimon Date: Mon, 1 Sep 2025 00:56:43 -0400 Subject: [PATCH] input: touchscreen: focaltech_0flash_v2_mmi: Fix firmware flashing Signed-off-by: electimon Change-Id: If15e9b940fa617b87fc5b3916cf4f687d6cbb5f8 --- .../focaltech_0flash_v2_mmi/focaltech_config.h | 2 +- .../focaltech_0flash_v2_mmi/focaltech_flash.c | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/drivers/input/touchscreen/focaltech_0flash_v2_mmi/focaltech_config.h b/drivers/input/touchscreen/focaltech_0flash_v2_mmi/focaltech_config.h index a8090b73d952..642f5a4ad9e2 100644 --- a/drivers/input/touchscreen/focaltech_0flash_v2_mmi/focaltech_config.h +++ b/drivers/input/touchscreen/focaltech_0flash_v2_mmi/focaltech_config.h @@ -271,7 +271,7 @@ /* * auto upgrade */ -#define FTS_AUTO_UPGRADE_EN 0 +#define FTS_AUTO_UPGRADE_EN 1 /* * auto upgrade for lcd cfg diff --git a/drivers/input/touchscreen/focaltech_0flash_v2_mmi/focaltech_flash.c b/drivers/input/touchscreen/focaltech_0flash_v2_mmi/focaltech_flash.c index d1bb667d93e0..5766aeb0f8a6 100644 --- a/drivers/input/touchscreen/focaltech_0flash_v2_mmi/focaltech_flash.c +++ b/drivers/input/touchscreen/focaltech_0flash_v2_mmi/focaltech_flash.c @@ -42,8 +42,6 @@ /* Example: focaltech_ts_fw_tianma.bin */ #if FTS_AUTO_UPGRADE_EN #define FTS_FW_NAME_PREX_WITH_REQUEST "focaltech_ts_fw_" -#else -#define FTS_FW_NAME_PREX_WITH_REQUEST "" #endif #define FTS_READ_BOOT_ID_TIMEOUT 3 @@ -950,7 +948,7 @@ int fts_fw_resume(bool need_reset) if (FTS_FW_REQUEST_SUPPORT) { snprintf(fwname, FILE_NAME_LENGTH, "%s%s.bin", \ - FTS_FW_NAME_PREX_WITH_REQUEST, upg->module_info->vendor_name); + FTS_FW_NAME_PREX_WITH_REQUEST, upg->ts_data->panel_supplier); ret = request_firmware(&fw, fwname, upg->ts_data->dev); if (ret == 0) { FTS_INFO("firmware(%s) request successfully", fwname); @@ -1144,7 +1142,7 @@ static int fts_get_fw_file_via_request_firmware(struct fts_upgrade *upg) #endif snprintf(fwname, FILE_NAME_LENGTH, "%s%s.bin", \ FTS_FW_NAME_PREX_WITH_REQUEST, \ - upg->module_info->vendor_name); + upg->ts_data->panel_supplier); ret = request_firmware(&fw, fwname, upg->ts_data->dev); if (0 == ret) { @@ -1229,10 +1227,6 @@ static int fts_fwupg_get_fw_file(struct fts_upgrade *upg) } FTS_INFO("upgrade fw file len:%d", upg->fw_length); - if (upg->fw_length < FTS_MIN_LEN) { - FTS_ERROR("fw file len(%d) fail", upg->fw_length); - return -ENODATA; - } return ret; }