From bb35cba6c18e7c9be284ce17c76e1b426a658697 Mon Sep 17 00:00:00 2001 From: Konstantin Makariev Date: Wed, 31 Mar 2021 10:06:15 -0500 Subject: [PATCH] synaptics_mmi_class: rename files Renamed sorce code files to avoid build system ambiguity Change-Id: Ibd86c6869880d340ded8548c92c2ce2cbad4ce7c Signed-off-by: Konstantin Makariev Reviewed-on: https://gerrit.mot.com/1914332 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Ling Jin Submit-Approved: Jira Key --- .../input/touchscreen/synaptics_mmi_class/Android.mk | 11 ++++------- drivers/input/touchscreen/synaptics_mmi_class/Kbuild | 9 ++++++--- ...sx_fw_update.c => synaptics_mmi_class_fw_update.c} | 0 ...cs_dsx_rmi_dev.c => synaptics_mmi_class_rmi_dev.c} | 0 ...porting.c => synaptics_mmi_class_test_reporting.c} | 0 5 files changed, 10 insertions(+), 10 deletions(-) rename drivers/input/touchscreen/synaptics_mmi_class/{synaptics_dsx_fw_update.c => synaptics_mmi_class_fw_update.c} (100%) rename drivers/input/touchscreen/synaptics_mmi_class/{synaptics_dsx_rmi_dev.c => synaptics_mmi_class_rmi_dev.c} (100%) rename drivers/input/touchscreen/synaptics_mmi_class/{synaptics_dsx_test_reporting.c => synaptics_mmi_class_test_reporting.c} (100%) diff --git a/drivers/input/touchscreen/synaptics_mmi_class/Android.mk b/drivers/input/touchscreen/synaptics_mmi_class/Android.mk index f09ea0b387e4..a54741d32672 100644 --- a/drivers/input/touchscreen/synaptics_mmi_class/Android.mk +++ b/drivers/input/touchscreen/synaptics_mmi_class/Android.mk @@ -1,11 +1,8 @@ DLKM_DIR := motorola/kernel/modules LOCAL_PATH := $(call my-dir) -ifneq (,$(findstring CONFIG_PANEL_NOTIFICATIONS,$(KERNEL_DEFCONFIG))) - ifneq ($(findstring touchscreen_mmi.ko,$(BOARD_VENDOR_KERNEL_MODULES)),) - KERNEL_CFLAGS += CONFIG_INPUT_TOUCHSCREEN_MMI=y -endif +KERNEL_CFLAGS += CONFIG_INPUT_TOUCHSCREEN_MMI=y ifeq ($(DRM_PANEL_NOTIFICATIONS),true) KERNEL_CFLAGS += CONFIG_DRM_PANEL_NOTIFICATIONS=y @@ -20,19 +17,19 @@ LOCAL_ADDITIONAL_DEPENDENCIES += $(KERNEL_MODULES_OUT)/touchscreen_mmi.ko include $(DLKM_DIR)/AndroidKernelModule.mk include $(CLEAR_VARS) -LOCAL_MODULE := synaptics_dsx_fw_update.ko +LOCAL_MODULE := synaptics_mmi_class_fw_update.ko LOCAL_MODULE_TAGS := optional LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT) include $(DLKM_DIR)/AndroidKernelModule.mk include $(CLEAR_VARS) -LOCAL_MODULE := synaptics_dsx_rmi_dev.ko +LOCAL_MODULE := synaptics_mmi_class_rmi_dev.ko LOCAL_MODULE_TAGS := optional LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT) include $(DLKM_DIR)/AndroidKernelModule.mk include $(CLEAR_VARS) -LOCAL_MODULE := synaptics_dsx_test_reporting.ko +LOCAL_MODULE := synaptics_mmi_class_test_reporting.ko LOCAL_MODULE_TAGS := optional LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT) include $(DLKM_DIR)/AndroidKernelModule.mk diff --git a/drivers/input/touchscreen/synaptics_mmi_class/Kbuild b/drivers/input/touchscreen/synaptics_mmi_class/Kbuild index ec9af6a95e64..5f3b642ccd50 100644 --- a/drivers/input/touchscreen/synaptics_mmi_class/Kbuild +++ b/drivers/input/touchscreen/synaptics_mmi_class/Kbuild @@ -3,6 +3,8 @@ EXTRA_CFLAGS += -Wall EXTRA_CFLAGS += -I$(ANDROID_BUILD_TOP)/motorola/kernel/modules/include \ -I$(ANDROID_BUILD_TOP)/motorola/kernel/modules/drivers/input/touchscreen/synaptics_mmi_class +ifeq ($(filter m y,$(CONFIG_PANEL_NOTIFICATIONS)),) + ifneq ($(filter banks%, $(TARGET_PRODUCT)),) EXTRA_CFLAGS += -DSOFTDEP_GPIO_PCAL6408 endif @@ -21,8 +23,9 @@ KBUILD_EXTRA_SYMBOLS += \ synaptics_mmi_class-objs = synaptics_dsx_i2c.o synaptics_dsx_mmi.o synaptics_dsx_instance.o obj-m += synaptics_mmi_class.o -obj-m += synaptics_dsx_fw_update.o -obj-m += synaptics_dsx_rmi_dev.o -obj-m += synaptics_dsx_test_reporting.o +obj-m += synaptics_mmi_class_fw_update.o +obj-m += synaptics_mmi_class_rmi_dev.o +obj-m += synaptics_mmi_class_test_reporting.o endif +endif diff --git a/drivers/input/touchscreen/synaptics_mmi_class/synaptics_dsx_fw_update.c b/drivers/input/touchscreen/synaptics_mmi_class/synaptics_mmi_class_fw_update.c similarity index 100% rename from drivers/input/touchscreen/synaptics_mmi_class/synaptics_dsx_fw_update.c rename to drivers/input/touchscreen/synaptics_mmi_class/synaptics_mmi_class_fw_update.c diff --git a/drivers/input/touchscreen/synaptics_mmi_class/synaptics_dsx_rmi_dev.c b/drivers/input/touchscreen/synaptics_mmi_class/synaptics_mmi_class_rmi_dev.c similarity index 100% rename from drivers/input/touchscreen/synaptics_mmi_class/synaptics_dsx_rmi_dev.c rename to drivers/input/touchscreen/synaptics_mmi_class/synaptics_mmi_class_rmi_dev.c diff --git a/drivers/input/touchscreen/synaptics_mmi_class/synaptics_dsx_test_reporting.c b/drivers/input/touchscreen/synaptics_mmi_class/synaptics_mmi_class_test_reporting.c similarity index 100% rename from drivers/input/touchscreen/synaptics_mmi_class/synaptics_dsx_test_reporting.c rename to drivers/input/touchscreen/synaptics_mmi_class/synaptics_mmi_class_test_reporting.c