From 559f5ff2cb1bc31f200f5b0fbbceb6678d38638b Mon Sep 17 00:00:00 2001 From: wangyq13 Date: Mon, 24 Oct 2022 22:16:44 +0800 Subject: [PATCH] input: nova_0flash_mmi: use different touch state macro nova_0flash_mmi: kernel 5.4 and kernel 5.10 msm drm are different, so need use different marco to control msm_drm.ko dependency. Change-Id: I079e3fd3649dadbcb8bb6f427b6475587995b644 Signed-off-by: wangyq13 Reviewed-on: https://gerrit.mot.com/2412213 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Jing Hu Reviewed-by: Huosheng Liao Submit-Approved: Jira Key --- drivers/input/touchscreen/nova_0flash_mmi/Android.mk | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/input/touchscreen/nova_0flash_mmi/Android.mk b/drivers/input/touchscreen/nova_0flash_mmi/Android.mk index 0d4822722811..6769516c59e7 100644 --- a/drivers/input/touchscreen/nova_0flash_mmi/Android.mk +++ b/drivers/input/touchscreen/nova_0flash_mmi/Android.mk @@ -17,7 +17,10 @@ endif ifneq ($(MOTO_PANEL_CHECK_TOUCH_STATE),) KBUILD_OPTIONS += CONFIG_INPUT_NOVA_0FLASH_MMI_NOTIFY_TOUCH_STATE=y - LOCAL_ADDITIONAL_DEPENDENCIES += $(KERNEL_MODULES_OUT)/msm_drm.ko +endif + +ifneq ($(MOTO_PANEL_CHECK_TOUCH_STATE_V2),) + KBUILD_OPTIONS += CONFIG_INPUT_NOVA_0FLASH_MMI_NOTIFY_TOUCH_STATE=y endif ifneq ($(BOARD_USES_PANEL_NOTIFICATIONS),) @@ -87,7 +90,7 @@ ifneq ($(findstring touchscreen_mmi.ko,$(BOARD_VENDOR_KERNEL_MODULES)),) KBUILD_OPTIONS += CONFIG_INPUT_TOUCHSCREEN_MMI=y LOCAL_ADDITIONAL_DEPENDENCIES += $(KERNEL_MODULES_OUT)/touchscreen_mmi.ko endif -ifneq ($(MOTO_PANEL_CHECK_TOUCH_STATE),) +ifneq ($(MOTO_PANEL_CHECK_TOUCH_STATE_V2),) LOCAL_ADDITIONAL_DEPENDENCIES += $(KERNEL_MODULES_OUT)/msm_drm.ko endif KBUILD_OPTIONS_GKI += GKI_OBJ_MODULE_DIR=gki