From 3e7d444e67db6cc0ce7906e4935dfe173857d590 Mon Sep 17 00:00:00 2001 From: hq_qiaoquanbin_tmp Date: Wed, 14 Nov 2018 20:03:24 +0800 Subject: [PATCH] (CR):[1/2] Merge "[Robusta2] tp: change firmware and esd process for fix tp invalid when doing esd" into huaqin/exynos9609 Change-Id: I0b0e6b6e7eea27c48720ef55fea9c121de61160f Signed-off-by: hq_qiaoquanbin_tmp --- drivers/input/touchscreen/hxchipset/himax_common.c | 2 ++ drivers/input/touchscreen/hxchipset/himax_ic_incell_core.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/input/touchscreen/hxchipset/himax_common.c b/drivers/input/touchscreen/hxchipset/himax_common.c index 82fbe9543b6f..48c5f69d57f7 100755 --- 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 e4d08641b659..931669c17b3a 100755 --- 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 -- 2.20.1