(CR):[Kane]:[factory] [2/2] tp:fix ESD recovery and upgrade novatek v03 firmware.

Change-Id: Ie764f16dca0476e224c852dfc7e01fd523a84dbe
Signed-off-by: hq_qiaoquanbin_tmp <qiaoquanbin@huaqin.com>

diff --git a/drivers/input/touchscreen/nt36xxx/nt36xxx.h b/drivers/input/touchscreen/nt36xxx/nt36xxx.h
index 21c3558eb3096a31b6ddd1c4288cf5d50f752c46..781b2bc7316f6176de6a5ab7a5fefa83152d4667 100755 (executable)
--- 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 84415777faa0d78d4b68678010c89df466ca53c0..49cd01795c12277f62802d3adc6ea708df5bed0f 100755 (executable)
--- 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;
 }
 
 /*******************************************************