EKKANE-108:[1/2] Merge "[Robusta2] tp: change firmware and esd process for fix tp...

when doing esd" into huaqin/exynos9609

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

diff --git a/drivers/input/touchscreen/hxchipset/himax_common.c b/drivers/input/touchscreen/hxchipset/himax_common.c
index 82fbe9543b6f1acc3a54b667dacb7261ae48f9fe..48c5f69d57f7592050c8be67e2e8cd25f8d7b18b 100755 (executable)
--- a/drivers/input/touchscreen/hxchipset/himax_common.c
+++ b/drivers/input/touchscreen/hxchipset/himax_common.c
@@ -2762,6 +2762,8 @@ int himax_chip_common_suspend(struct himax_ts_data *ts)
                return 0;
        }
 
+       HX_ESD_RESET_ACTIVATE = 0;
+
 #if defined(HX_SMART_WAKEUP) || defined(HX_HIGH_SENSE) || defined(HX_USB_DETECT_GLOBAL)
 #ifndef HX_RESUME_SEND_CMD
        g_core_fp.fp_resend_cmd_func(ts->suspended);

diff --git a/drivers/input/touchscreen/hxchipset/himax_ic_incell_core.c b/drivers/input/touchscreen/hxchipset/himax_ic_incell_core.c
index e4d08641b659fb202272baecf80a81d6a76b10dd..931669c17b3a5b65e75e13739eac9c3fb9b11a1b 100755 (executable)
--- a/drivers/input/touchscreen/hxchipset/himax_ic_incell_core.c
+++ b/drivers/input/touchscreen/hxchipset/himax_ic_incell_core.c
@@ -1717,7 +1717,7 @@ END_FUNCTION:
 
 static void himax_mcu_esd_ic_reset(void)
 {
-       HX_ESD_RESET_ACTIVATE = 0;
+       HX_ESD_RESET_ACTIVATE = 1;
 #ifdef HX_RST_PIN_FUNC
        himax_mcu_pin_reset();
 #endif