From d66e25e68c2875e02b4e86ee1a9f8df769e388c2 Mon Sep 17 00:00:00 2001 From: dengwei1 Date: Fri, 28 Aug 2020 10:36:54 +0800 Subject: [PATCH] guam: input update touch ilitek fw 02 input update touch ilitek fw 02 and enable esd NO_PROP_NEEDED Change-Id: I7f6a1f0cf74e6304436da25ea18d0f51a781c9cb Signed-off-by: dengwei1 Reviewed-on: https://gerrit.mot.com/1735679 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Wang Wang Submit-Approved: Jira Key --- drivers/input/touchscreen/ili9882_mmi/Android.mk | 4 ++++ drivers/input/touchscreen/ili9882_mmi/Kbuild | 3 +++ drivers/input/touchscreen/ili9882_mmi/ili9882.h | 4 ++++ 3 files changed, 11 insertions(+) diff --git a/drivers/input/touchscreen/ili9882_mmi/Android.mk b/drivers/input/touchscreen/ili9882_mmi/Android.mk index a2a388d1ed25..90b7a2a71aea 100644 --- a/drivers/input/touchscreen/ili9882_mmi/Android.mk +++ b/drivers/input/touchscreen/ili9882_mmi/Android.mk @@ -13,6 +13,10 @@ ifneq ($(DL_FW_BY_DISPLAY),) KERNEL_CFLAGS += CONFIG_ILITEK_RESUME_BY_DDI=y endif +ifeq ($(ILITEK_ESD),true) + KERNEL_CFLAGS += CONFIG_ILITEK_ESD=y +endif + include $(CLEAR_VARS) LOCAL_MODULE := ili9882_mmi.ko LOCAL_MODULE_TAGS := optional diff --git a/drivers/input/touchscreen/ili9882_mmi/Kbuild b/drivers/input/touchscreen/ili9882_mmi/Kbuild index 54d1be97a0f0..a46ef240cdda 100644 --- a/drivers/input/touchscreen/ili9882_mmi/Kbuild +++ b/drivers/input/touchscreen/ili9882_mmi/Kbuild @@ -17,6 +17,9 @@ endif ifneq ($(filter m y,$(CONFIG_ILITEK_RESUME_BY_DDI)),) EXTRA_CFLAGS += -DILI_CONFIG_RESUME_BY_DDI endif +ifneq ($(filter m y,$(CONFIG_ILITEK_ESD)),) +EXTRA_CFLAGS += -DILI_CONFIG_ESD +endif ili9882_mmi-objs += ili9882.o ili9882_mmi-objs += ili9882_spi.o diff --git a/drivers/input/touchscreen/ili9882_mmi/ili9882.h b/drivers/input/touchscreen/ili9882_mmi/ili9882.h index 689e77a257a6..b557a159998c 100755 --- a/drivers/input/touchscreen/ili9882_mmi/ili9882.h +++ b/drivers/input/touchscreen/ili9882_mmi/ili9882.h @@ -128,7 +128,11 @@ #define MT_B_TYPE ENABLE #define TDDI_RST_BIND DISABLE #define MT_PRESSURE DISABLE +#ifdef ILI_CONFIG_ESD +#define ENABLE_WQ_ESD ENABLE +#else #define ENABLE_WQ_ESD DISABLE +#endif #define ENABLE_WQ_BAT DISABLE #define ENABLE_GESTURE DISABLE #define REGULATOR_POWER DISABLE