From: hq_qiaoquanbin_tmp Date: Mon, 10 Dec 2018 03:15:32 +0000 (+0800) Subject: (CR):[Kane]:[factory] [2/2] tp:fix ESD recovery and upgrade novatek v03 firmware. X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f594bea7337959c5d5d0e9e0bab47c7b17c91887;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git (CR):[Kane]:[factory] [2/2] tp:fix ESD recovery and upgrade novatek v03 firmware. Change-Id: Ie764f16dca0476e224c852dfc7e01fd523a84dbe Signed-off-by: hq_qiaoquanbin_tmp --- diff --git a/drivers/input/touchscreen/nt36xxx/nt36xxx.h b/drivers/input/touchscreen/nt36xxx/nt36xxx.h index 21c3558eb309..781b2bc7316f 100755 --- a/drivers/input/touchscreen/nt36xxx/nt36xxx.h +++ b/drivers/input/touchscreen/nt36xxx/nt36xxx.h @@ -90,7 +90,7 @@ extern const uint16_t gesture_key_array[]; #define BOOT_UPDATE_FIRMWARE 1 #define BOOT_UPDATE_FIRMWARE_NAME "novatek_ts_fw.bin" /* ---ESD Protect.--- */ -#define NVT_TOUCH_ESD_PROTECT 0 +#define NVT_TOUCH_ESD_PROTECT 1 #define NVT_TOUCH_ESD_CHECK_PERIOD 2000 /* ms */ #if defined(CONFIG_CHARGER_NOTIFY) diff --git a/drivers/input/touchscreen/nt36xxx/nt36xxx_fw_update.c b/drivers/input/touchscreen/nt36xxx/nt36xxx_fw_update.c index 84415777faa0..49cd01795c12 100755 --- a/drivers/input/touchscreen/nt36xxx/nt36xxx_fw_update.c +++ b/drivers/input/touchscreen/nt36xxx/nt36xxx_fw_update.c @@ -135,10 +135,10 @@ int32_t Check_FW_Ver(void) } // compare IC and binary FW version - if (buf[1] > fw_entry->data[FW_BIN_VER_OFFSET]) - return 1; - else + if (buf[1] != fw_entry->data[FW_BIN_VER_OFFSET]) return 0; + else + return 1; } /*******************************************************