From 5ff96b0a447cf3670957ae01c051bfdffcfa6ddc Mon Sep 17 00:00:00 2001
From: Michael Bestas <mkbestas@lineageos.org>
Date: Mon, 17 Apr 2023 16:54:37 +0300
Subject: [PATCH] treewide: Setup inline build for moto bengal/rhode modules

Change-Id: Ic323acad308e7579ab44497cce33d9735bcb9409
---
 drivers/input/misc/Kconfig                    |   1 +
 drivers/input/misc/Makefile                   |   1 +
 drivers/input/misc/focal_fps_mmi/Kbuild       |  50 +-------
 drivers/input/misc/focal_fps_mmi/Kconfig      |   6 +
 drivers/input/touchscreen/Kconfig             |   6 +
 drivers/input/touchscreen/Makefile            |   3 +
 .../touchscreen/focaltech_touch_v3/Kbuild     |  80 ++-----------
 .../touchscreen/focaltech_touch_v3/Kconfig    |  85 ++++++++++++++
 .../touchscreen/goodix_berlin_mmi/Kbuild      | 108 +-----------------
 .../touchscreen/goodix_berlin_mmi/Kconfig     |  49 +++++++-
 .../touchscreen/synaptics_tcm2_mmi/Kbuild     |  33 +-----
 .../touchscreen/synaptics_tcm2_mmi/Kconfig    |  13 +--
 drivers/regulator/wl2868c/Kbuild              |   5 -
 13 files changed, 172 insertions(+), 268 deletions(-)
 create mode 100644 drivers/input/misc/focal_fps_mmi/Kconfig
 delete mode 100644 drivers/regulator/wl2868c/Kbuild

diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index f004d7f45b8b..1d53a5606673 100644
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -887,6 +887,7 @@ config INPUT_SC27XX_VIBRA
 
 source "drivers/input/misc/ets_bix_mmi/Kconfig"
 source "drivers/input/misc/ets_fps_mmi/Kconfig"
+source "drivers/input/misc/focal_fps_mmi/Kconfig"
 source "drivers/input/misc/fpc_fps_mmi/Kconfig"
 source "drivers/input/misc/qpnp_power_on_mmi/Kconfig"
 source "drivers/input/misc/vl53L1/Kconfig"
diff --git a/drivers/input/misc/Makefile b/drivers/input/misc/Makefile
index 9a555f0b0ec7..5dba43286712 100644
--- a/drivers/input/misc/Makefile
+++ b/drivers/input/misc/Makefile
@@ -88,6 +88,7 @@ obj-$(CONFIG_INPUT_IDEAPAD_SLIDEBAR)	+= ideapad_slidebar.o
 
 obj-$(CONFIG_INPUT_EGISTEC_BIX)		+= ets_bix_mmi/
 obj-$(CONFIG_INPUT_EGISTEC_FPS)		+= ets_fps_mmi/
+obj-$(CONFIG_INPUT_FOCAL_FPS)		+= focal_fps_mmi/
 obj-$(CONFIG_INPUT_MISC_FPC1020)	+= fpc_fps_mmi/
 obj-$(CONFIG_INPUT_QPNP_POWER_ON_MMI)	+= qpnp_power_on_mmi/
 obj-$(CONFIG_INPUT_STMVL53L1)		+= vl53L1/
diff --git a/drivers/input/misc/focal_fps_mmi/Kbuild b/drivers/input/misc/focal_fps_mmi/Kbuild
index 4f9cb1ae2a70..08e4a7e462a7 100644
--- a/drivers/input/misc/focal_fps_mmi/Kbuild
+++ b/drivers/input/misc/focal_fps_mmi/Kbuild
@@ -1,49 +1,3 @@
-# add -Wall to try to catch everything we can.
-EXTRA_CFLAGS += -Wall
-EXTRA_CFLAGS += -I$(ANDROID_BUILD_TOP)/motorola/kernel/modules/include \
-		-I$(ANDROID_BUILD_TOP)/motorola/kernel/modules/drivers/input/misc/focal_fps_mmi
-
-
-
-
-
-
-
-# Early-logging level for ff_hal, ff_ta and driver as well. Note that this
-# logging level only takes effect before ff_config module is loaded.
-#
-# Options:
-# 0 - FF_LOG_LEVEL_ALL, All
-# 1 - FF_LOG_LEVEL_VBS, Verbose
-# 2 - FF_LOG_LEVEL_DBG, Debug
-# 3 - FF_LOG_LEVEL_INF, Info
-# 4 - FF_LOG_LEVEL_WRN, Warning
-# 5 - FF_LOG_LEVEL_ERR, Error
-EXTRA_CFLAGS  += -D__FF_BUILD_DATE=\"$(shell date +%Y%m%d)\"
-EXTRA_CFLAGS += -D__FF_EARLY_LOG_LEVEL=2
-
-
-focal_fps_mmi-y +=  ff_ctl.o plat-msm.o
-
-ifneq ($(filter m y,$(CONFIG_INPUT_EGISTEC_FPS_NAVI)),)
-	EXTRA_CFLAGS += -DCONFIG_INPUT_EGISTEC_FPS_NAVI
-	ets_fps_mmi-y += ets_navi_input.o
-endif
-ifneq ($(filter m y,$(CONFIG_INPUT_EGISTEC_FPS_NAVI_VERTICAL)),)
-	EXTRA_CFLAGS += -DCONFIG_INPUT_EGISTEC_FPS_NAVI_VERTICAL
-endif
-ifeq ($(TARGET_BUILD_VARIANT),userdebug)
-	EXTRA_CFLAGS += -DFP_SPI_DEBUG
-endif
-
-ifneq ($(filter m y,$(CONFIG_FOCAL_SUPPORT_DRM_SCREEN)),)
-	EXTRA_CFLAGS += -DCONFIG_DRM_PANEL_NOTIFICATIONS
-endif
-
-ifneq ($(filter m y, $(CONFIG_FOCAL_PANEL_NOTIFICATIONS)),)
-	EXTRA_CFLAGS += -DCONFIG_PANEL_NOTIFICATIONS
-endif
-
-obj-m += focal_fps_mmi.o
-
+focal_fps_mmi-y += ff_ctl.o plat-msm.o
 
+obj-$(CONFIG_INPUT_FOCAL_FPS) += focal_fps_mmi.o
diff --git a/drivers/input/misc/focal_fps_mmi/Kconfig b/drivers/input/misc/focal_fps_mmi/Kconfig
new file mode 100644
index 000000000000..3c13fccbefff
--- /dev/null
+++ b/drivers/input/misc/focal_fps_mmi/Kconfig
@@ -0,0 +1,6 @@
+config INPUT_FOCAL_FPS
+	tristate "FocalTech fingerprint sensor"
+	default n
+	help
+	 Say Y here if you wish to include support for FocalTech finger print sensor.
+	 If unsure, say N.
diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index a7dcb0dc0b2c..5e37fd03840c 100644
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -1370,14 +1370,20 @@ config TOUCHSCREEN_HIMAX_CHIPSET
 
 source "drivers/input/touchscreen/hxchipset/Kconfig"
 
+source "drivers/input/touchscreen/goodix_berlin_mmi/Kconfig"
+
 source "drivers/input/touchscreen/nova_0flash_mmi/Kconfig"
 
 source "drivers/input/touchscreen/touchscreen_mmi/Kconfig"
 
 source "drivers/input/touchscreen/stmicro_mmi/Kconfig"
 
+source "drivers/input/touchscreen/synaptics_tcm2_mmi/Kconfig"
+
 source "drivers/input/touchscreen/focaltech_0flash_v2_mmi/Kconfig"
 
+source "drivers/input/touchscreen/focaltech_touch_v3/Kconfig"
+
 source "drivers/input/touchscreen/focaltech_v2_mmi/Kconfig"
 
 source "drivers/input/touchscreen/ili9882_mmi/Kconfig"
diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Makefile
index afac207fafe1..ec1abc841ad2 100644
--- a/drivers/input/touchscreen/Makefile
+++ b/drivers/input/touchscreen/Makefile
@@ -117,9 +117,12 @@ obj-$(CONFIG_TOUCHSCREEN_FT3519)   += ft3519/
 obj-$(CONFIG_TOUCHSCREEN_NT36XXX)	+= nt36xxx/
 obj-$(CONFIG_TOUCHSCREEN_HIMAX_CHIPSET)	+= hxchipset/
 
+obj-$(CONFIG_TOUCHSCREEN_GOODIX_BRL)	+= goodix_berlin_mmi/
 obj-$(CONFIG_TOUCHSCREEN_NT36xxx_HOSTDL_SPI_MMI)	+= nova_0flash_mmi/
 obj-$(CONFIG_INPUT_TOUCHSCREEN_MMI)	+= touchscreen_mmi/
 obj-$(CONFIG_TOUCHSCREEN_FTS_TS) += stmicro_mmi/
+obj-$(CONFIG_TOUCHSCREEN_SYNA_TCM2) += synaptics_tcm2_mmi/
 obj-$(CONFIG_INPUT_TOUCHSCREEN_FOCALTECH_0FLASH_V2_MMI) += focaltech_0flash_v2_mmi/
+obj-$(CONFIG_INPUT_TOUCHSCREEN_FOCALTECH_V3) += focaltech_touch_v3/
 obj-$(CONFIG_INPUT_TOUCHSCREEN_FOCALTECH_V2_MMI) += focaltech_v2_mmi/
 obj-$(CONFIG_INPUT_TOUCHSCREEN_ILI_9882_MMI) += ili9882_mmi/
diff --git a/drivers/input/touchscreen/focaltech_touch_v3/Kbuild b/drivers/input/touchscreen/focaltech_touch_v3/Kbuild
index c03284477988..071e153de09f 100644
--- a/drivers/input/touchscreen/focaltech_touch_v3/Kbuild
+++ b/drivers/input/touchscreen/focaltech_touch_v3/Kbuild
@@ -1,11 +1,4 @@
-# add -Wall to try to catch everything we can.
-EXTRA_CFLAGS += -Wall
-EXTRA_CFLAGS += -I$(ANDROID_BUILD_TOP)/motorola/kernel/modules/include \
-		-I$(ANDROID_BUILD_TOP)/motorola/kernel/modules/drivers/input/touchscreen/focaltech_touch_v3 \
-		-I$(ANDROID_BUILD_TOP)/motorola/kernel/modules/drivers/input/touchscreen/focaltech_touch_v3/include \
-		-I$(ANDROID_BUILD_TOP)/motorola/kernel/modules/drivers/input/touchscreen/focaltech_touch_v3/focaltech_test
-
-obj-m := focaltech_v3.o
+obj-$(CONFIG_INPUT_TOUCHSCREEN_FOCALTECH_V3) := focaltech_v3.o
 focaltech_v3-objs += focaltech_core.o
 focaltech_v3-objs += focaltech_ex_fun.o
 focaltech_v3-objs += focaltech_ex_mode.o
@@ -20,67 +13,16 @@ focaltech_v3-objs += focaltech_test/focaltech_test_ini.o
 focaltech_v3-objs += focaltech_test/supported_ic/focaltech_test_ft3681.o
 focaltech_v3-objs += focaltech_ts_config.o
 
-ifneq ($(filter ft3681,$(CONFIG_INPUT_FOCALTECH_V3_MMI_IC_NAME)),)
-	EXTRA_CFLAGS += -DCONFIG_INPUT_FOCALTECH_V3_MMI_IC_NAME_FT3681
-endif
-
 ifneq ($(filter m y,$(CONFIG_INPUT_TOUCHSCREEN_MMI)),)
-       KBUILD_EXTRA_SYMBOLS += $(CURDIR)/$(KBUILD_EXTMOD)/../touchscreen_mmi/$(GKI_OBJ_MODULE_DIR)/Module.symvers
-       EXTRA_CFLAGS += -DCONFIG_INPUT_TOUCHSCREEN_MMI
-       focaltech_v3-objs += focaltech_ts_mmi.o
-endif
-ifneq ($(filter m y,$(CONFIG_INPUT_FOCALTECH_V3_MMI_ENABLE_DOUBLE_TAP)),)
-	EXTRA_CFLAGS += -DFOCALTECH_SENSOR_EN
-endif
-ifneq ($(filter m y,$(CONFIG_INPUT_FOCALTECH_V3_MMI_ENABLE_PALM)),)
-	EXTRA_CFLAGS += -DFOCALTECH_PALM_SENSOR_EN
-endif
-ifneq ($(filter m y,$(CONFIG_INPUT_FOCALTECH_V3_MMI_PEN_NOTIFIER)),)
-	KBUILD_EXTRA_SYMBOLS += $(CURDIR)/$(KBUILD_EXTMOD)/../../../misc/pen/Module.symvers
-	EXTRA_CFLAGS += -DFOCALTECH_PEN_NOTIFIER
+ccflags-y += -DCONFIG_INPUT_TOUCHSCREEN_MMI
+focaltech_v3-objs += focaltech_ts_mmi.o
 endif
 
-ifneq ($(filter m y, $(CONFIG_DRM_PANEL_NOTIFICATIONS)),)
-	EXTRA_CFLAGS += -DCONFIG_DRM_PANEL_NOTIFICATIONS
-endif
-
-ifneq ($(filter m y, $(CONFIG_DRM_PANEL_EVENT_NOTIFICATIONS)),)
-	EXTRA_CFLAGS += -DCONFIG_DRM_PANEL_EVENT_NOTIFICATIONS
-endif
-
-ifneq ($(filter m y, $(CONFIG_FTS_NOISE_TEST_P2P)),)
-	EXTRA_CFLAGS += -DCONFIG_FTS_NOISE_TEST_P2P
-endif
-
-ifneq ($(filter m y, $(CONFIG_FTS_COMPATIBLE_WITH_GKI)),)
-	EXTRA_CFLAGS += -DCONFIG_FTS_COMPATIBLE_WITH_GKI
-endif
-
-ifneq ($(filter m y, $(CONFIG_FTS_DOUBLE_TAP_CONTROL)),)
-	EXTRA_CFLAGS += -DCONFIG_FTS_DOUBLE_TAP_CONTROL
-endif
-
-ifneq ($(filter m y, $(CONFIG_FTS_SUPPORT_HIGH_RESOLUTION)),)
-	EXTRA_CFLAGS += -DCONFIG_FTS_SUPPORT_HIGH_RESOLUTION
-endif
-
-ifneq ($(filter m y, $(CONFIG_FTS_VDD_GPIO_CONTROL)),)
-	EXTRA_CFLAGS += -DCONFIG_FTS_VDD_GPIO_CONTROL
-endif
-
-ifneq ($(filter m y,$(CONFIG_FTS_LAST_TIME)),)
-    EXTRA_CFLAGS += -DCONFIG_FTS_LAST_TIME
-endif
-
-ifneq ($(findstring _factory,$(TARGET_PRODUCT)),)
-USE_TARGET_PRODUCT := $(strip $(subst _factory,, $(TARGET_PRODUCT)))
-else
-USE_TARGET_PRODUCT := $(TARGET_PRODUCT)
-endif
-
-ifneq ($(filter bangkk%, $(USE_TARGET_PRODUCT)), )
-        EXTRA_CFLAGS += -DPRODUCT_BANGKK
-endif
-
-KBUILD_EXTRA_SYMBOLS += $(CURDIR)/../../kernel/msm-$(MODULE_KERNEL_VERSION)/Module.symvers
-KBUILD_EXTRA_SYMBOLS += $(CURDIR)/$(KBUILD_EXTMOD)/../../../mmi_info/$(GKI_OBJ_MODULE_DIR)/Module.symvers
+ccflags-$(CONFIG_INPUT_TOUCHSCREEN_FOCALTECH_V3_MMI_NOISE_TEST_P2P) += -DCONFIG_FTS_NOISE_TEST_P2P
+ccflags-$(CONFIG_INPUT_TOUCHSCREEN_FOCALTECH_V3_MMI_COMPATIBLE_WITH_GKI) += -DCONFIG_FTS_COMPATIBLE_WITH_GKI
+ccflags-$(CONFIG_INPUT_TOUCHSCREEN_FOCALTECH_V3_MMI_DOUBLE_TAP_CONTROL) += -DCONFIG_FTS_DOUBLE_TAP_CONTROL
+ccflags-$(CONFIG_INPUT_TOUCHSCREEN_FOCALTECH_V3_MMI_SUPPORT_HIGH_RESOLUTION) += -DCONFIG_FTS_SUPPORT_HIGH_RESOLUTION
+ccflags-$(CONFIG_INPUT_TOUCHSCREEN_FOCALTECH_V3_MMI_VDD_GPIO_CONTROL) += -DCONFIG_FTS_VDD_GPIO_CONTROL
+ccflags-$(CONFIG_INPUT_TOUCHSCREEN_FOCALTECH_V3_MMI_LAST_TIME) += -DCONFIG_FTS_LAST_TIME
+ccflags-$(CONFIG_INPUT_TOUCHSCREEN_FOCALTECH_V3_MMI_ENABLE_DOUBLE_TAP) += -DFOCALTECH_SENSOR_EN
+ccflags-$(CONFIG_INPUT_TOUCHSCREEN_FOCALTECH_V3_MMI_ENABLE_PALM) += -DFOCALTECH_PALM_SENSOR_EN
diff --git a/drivers/input/touchscreen/focaltech_touch_v3/Kconfig b/drivers/input/touchscreen/focaltech_touch_v3/Kconfig
index 919ad060a770..aacb545ee67e 100644
--- a/drivers/input/touchscreen/focaltech_touch_v3/Kconfig
+++ b/drivers/input/touchscreen/focaltech_touch_v3/Kconfig
@@ -13,3 +13,88 @@ config TOUCHSCREEN_FTS_DIRECTORY_V3
     string "Focaltech ts v3 directory name"
     default "focaltech_touch_v3"
     depends on TOUCHSCREEN_FTS_V3
+
+config INPUT_TOUCHSCREEN_FOCALTECH_V3
+    tristate "FocalTech Touchscreen Driver V3"
+    depends on INPUT_TOUCHSCREEN_MMI
+    default n
+    help
+      Say Y here if you wish to include support for FocalTech Touchscreen V3.
+
+      If unsure, say N.
+
+      To compile this driver as a module, choose M here: the
+      module will be called focaltech_v3.
+
+if INPUT_TOUCHSCREEN_FOCALTECH_V3
+
+config INPUT_TOUCHSCREEN_FOCALTECH_V3_MMI_NOISE_TEST_P2P
+    bool "FocalTech V3 MMI Noise test point to point"
+    default n
+    help
+      Say Y here if you want to have Noise test point to point support on Moto
+      FocalTech V3.
+
+      If unsure, say N.
+
+config INPUT_TOUCHSCREEN_FOCALTECH_V3_MMI_COMPATIBLE_WITH_GKI
+    bool "FocalTech V3 MMI GKI compatibility"
+    default n
+    help
+      Say Y here if you want to have GKI compatibility support on Moto
+      FocalTech V3.
+
+      If unsure, say N.
+
+config INPUT_TOUCHSCREEN_FOCALTECH_V3_MMI_DOUBLE_TAP_CONTROL
+    bool "FocalTech V3 MMI Double tap control"
+    default n
+    help
+      Say Y here if you want to have Double tap control support on Moto
+      FocalTech V3.
+
+      If unsure, say N.
+
+config INPUT_TOUCHSCREEN_FOCALTECH_V3_MMI_SUPPORT_HIGH_RESOLUTION
+    bool "FocalTech V3 MMI High resolution"
+    default n
+    help
+      Say Y here if you want to have High resolution support on Moto
+      FocalTech V3.
+
+      If unsure, say N.
+
+config INPUT_TOUCHSCREEN_FOCALTECH_V3_MMI_VDD_GPIO_CONTROL
+    bool "FocalTech V3 MMI VDD GPIO control"
+    default n
+    help
+      Say Y here if you want to have VDD GPIO control support on Moto
+      FocalTech V3.
+
+      If unsure, say N.
+
+config INPUT_TOUCHSCREEN_FOCALTECH_V3_MMI_LAST_TIME
+    bool "FocalTech V3 MMI Timestamp"
+    default n
+    help
+      Say Y here if you want to have Timestamp support on Moto FocalTech V3.
+
+      If unsure, say N.
+
+config INPUT_TOUCHSCREEN_FOCALTECH_V3_MMI_ENABLE_DOUBLE_TAP
+    bool "FocalTech V3 MMI Double tap"
+    default n
+    help
+      Say Y here if you want to have Double tap support on Moto FocalTech V3.
+
+      If unsure, say N.
+
+config INPUT_TOUCHSCREEN_FOCALTECH_V3_MMI_ENABLE_PALM
+    bool "FocalTech V3 MMI Palm Sensor"
+    default n
+    help
+      Say Y here if you want to have palm sensor support on Moto FocalTech V3.
+
+      If unsure, say N.
+
+endif
diff --git a/drivers/input/touchscreen/goodix_berlin_mmi/Kbuild b/drivers/input/touchscreen/goodix_berlin_mmi/Kbuild
index b36ffd9db58e..4a2a8d51a2eb 100644
--- a/drivers/input/touchscreen/goodix_berlin_mmi/Kbuild
+++ b/drivers/input/touchscreen/goodix_berlin_mmi/Kbuild
@@ -1,9 +1,4 @@
-# add -Wall to try to catch everything we can.
-EXTRA_CFLAGS += -Wall
-EXTRA_CFLAGS += \
-		-I$(ANDROID_BUILD_TOP)/motorola/kernel/modules/include
-
-obj-m := goodix_brl_mmi.o
+obj-$(CONFIG_TOUCHSCREEN_GOODIX_BRL) := goodix_brl_mmi.o
 goodix_brl_mmi-objs := \
 					goodix_brl_i2c.o \
 					goodix_brl_spi.o \
@@ -16,110 +11,17 @@ goodix_brl_mmi-objs := \
 					goodix_ts_tools.o \
 					goodix_ts_config.o
 
-ifneq ($(filter m y, $(CONFIG_DRM_PANEL_EVENT_NOTIFICATIONS)),)
-	EXTRA_CFLAGS += -DCONFIG_DRM_PANEL_EVENT_NOTIFICATIONS
-endif
-
-ifneq ($(filter m y,$(CONFIG_DRM_PANEL_NOTIFICATIONS)),)
-    EXTRA_CFLAGS += -DCONFIG_DRM_PANEL_NOTIFICATIONS
-endif
-
-ifneq ($(filter m y,$(CONFIG_TOUCHSCREEN_GOODIX_BRL_SPI)),)
-    EXTRA_CFLAGS += -DCONFIG_TOUCHSCREEN_GOODIX_BRL_SPI
-endif
-
 ifneq ($(filter m y,$(CONFIG_GTP_FOD)),)
-    EXTRA_CFLAGS += -DCONFIG_GTP_FOD
     goodix_brl_mmi-objs += goodix_ts_gesture_fod.o
 else
     goodix_brl_mmi-objs += goodix_ts_gesture.o
 endif
 
-ifneq ($(filter m y,$(CONFIG_GTP_LIMIT_USE_SUPPLIER)),)
-    EXTRA_CFLAGS += -DCONFIG_GTP_LIMIT_USE_SUPPLIER
-endif
-
-ifneq ($(filter m y,$(CONFIG_GTP_ENABLE_PM_QOS)),)
-    EXTRA_CFLAGS += -DCONFIG_GTP_ENABLE_PM_QOS
-endif
-
-ifneq ($(filter m y,$(CONFIG_GOODIX_ESD_ENABLE)),)
-    EXTRA_CFLAGS += -DCONFIG_GOODIX_ESD_ENABLE
-endif
-
-ifneq ($(filter m y,$(CONFIG_TARGET_BUILD_FACROTY)),)
-    EXTRA_CFLAGS += -DGTP_SAVE_IN_CSV
-endif
-
-ifneq ($(filter m y,$(CONFIG_GTP_LAST_TIME)),)
-    EXTRA_CFLAGS += -DCONFIG_GTP_LAST_TIME
-endif
-
-ifneq ($(filter m y,$(CONFIG_GTP_DDA_STYLUS)),)
-    EXTRA_CFLAGS += -DCONFIG_GTP_DDA_STYLUS
-    goodix_brl_mmi-objs += goodix_ts_dda.o
-endif
+goodix_brl_mmi-$(CONFIG_GTP_DDA_STYLUS) += goodix_ts_dda.o
 
 ifneq ($(filter m y,$(CONFIG_INPUT_TOUCHSCREEN_MMI)),)
-    EXTRA_CFLAGS += -DCONFIG_INPUT_TOUCHSCREEN_MMI
-    goodix_brl_mmi-objs += goodix_ts_mmi.o
+ccflags-y += -DCONFIG_INPUT_TOUCHSCREEN_MMI
+goodix_brl_mmi-objs += goodix_ts_mmi.o
 endif
 
-ifneq ($(filter m y, $(CONFIG_BOARD_USES_DOUBLE_TAP_CTRL)),)
-	EXTRA_CFLAGS += -DCONFIG_BOARD_USES_DOUBLE_TAP_CTRL
-endif
-
-ifneq ($(filter m y,$(CONFIG_INPUT_GOODIX_MMI_ENABLE_PALM)),)
-    EXTRA_CFLAGS += -DGOODIX_PALM_SENSOR_EN
-endif
-
-ifeq ($(TARGET_BUILD_VARIANT), userdebug)
-ifneq ($(filter m y, $(CONFIG_GTP_GHOST_LOG_CAPTURE)),)
-	EXTRA_CFLAGS += -DCONFIG_GTP_GHOST_LOG_CAPTURE
-	goodix_brl_mmi-objs += goodix_ts_log_capture.o
-endif
-endif
-
-ifneq ($(filter m y,$(CONFIG_ENABLE_GTP_PALM_CANCEL)),)
-    EXTRA_CFLAGS += -DCONFIG_ENABLE_GTP_PALM_CANCEL
-endif
-
-ifneq ($(findstring _factory,$(TARGET_PRODUCT)),)
-USE_TARGET_PRODUCT := $(strip $(subst _factory,, $(TARGET_PRODUCT)))
-else
-USE_TARGET_PRODUCT := $(TARGET_PRODUCT)
-endif
-
-ifneq ($(filter oneli, $(USE_TARGET_PRODUCT)), )
-        EXTRA_CFLAGS += -DPRODUCT_ONELI
-else ifneq ($(filter hiphi, $(USE_TARGET_PRODUCT)), )
-        EXTRA_CFLAGS += -DPRODUCT_HIPHI
-else ifneq ($(filter hiphic, $(USE_TARGET_PRODUCT)), )
-        EXTRA_CFLAGS += -DPRODUCT_HIPHIC
-else ifneq ($(filter li, $(USE_TARGET_PRODUCT)), )
-        EXTRA_CFLAGS += -DPRODUCT_LI
-else ifneq ($(filter eqs, $(USE_TARGET_PRODUCT)), )
-        EXTRA_CFLAGS += -DPRODUCT_EQS
-else ifneq ($(filter tundra%, $(USE_TARGET_PRODUCT)), )
-        EXTRA_CFLAGS += -DPRODUCT_TUNDRA
-else ifneq ($(filter miami%, $(USE_TARGET_PRODUCT)), )
-        EXTRA_CFLAGS += -DPRODUCT_MIAMI
-else ifneq ($(filter rtwo%, $(USE_TARGET_PRODUCT)), )
-        EXTRA_CFLAGS += -DPRODUCT_RTWO
-else ifneq ($(filter ctwo%, $(USE_TARGET_PRODUCT)), )
-        EXTRA_CFLAGS += -DPRODUCT_CTWO
-else ifneq ($(filter bronco, $(USE_TARGET_PRODUCT)), )
-        EXTRA_CFLAGS += -DPRODUCT_BRONCO
-else ifneq ($(filter felix, $(USE_TARGET_PRODUCT)), )
-        EXTRA_CFLAGS += -DCONFIG_GTP_DISP_MODE
-else ifneq ($(filter zeekr%, $(USE_TARGET_PRODUCT)), )
-        EXTRA_CFLAGS += -DPRODUCT_ZEEKR
-else ifneq ($(filter lynkco%, $(USE_TARGET_PRODUCT)), )
-        EXTRA_CFLAGS += -DPRODUCT_LYNKCO
-else ifneq ($(filter bangkk%, $(USE_TARGET_PRODUCT)), )
-        EXTRA_CFLAGS += -DPRODUCT_BANGKK
-endif
-$(warning "william EXTRA_CFLAGS = $(EXTRA_CFLAGS)")
-
-KBUILD_EXTRA_SYMBOLS += $(CURDIR)/$(KBUILD_EXTMOD)/../touchscreen_mmi/$(GKI_OBJ_MODULE_DIR)/Module.symvers
-KBUILD_EXTRA_SYMBOLS += $(CURDIR)/$(KBUILD_EXTMOD)/../../../mmi_info/$(GKI_OBJ_MODULE_DIR)/Module.symvers
+ccflags-$(CONFIG_INPUT_GOODIX_MMI_ENABLE_PALM) += -DGOODIX_PALM_SENSOR_EN
diff --git a/drivers/input/touchscreen/goodix_berlin_mmi/Kconfig b/drivers/input/touchscreen/goodix_berlin_mmi/Kconfig
index 223d5aea824e..3ff3498259d9 100644
--- a/drivers/input/touchscreen/goodix_berlin_mmi/Kconfig
+++ b/drivers/input/touchscreen/goodix_berlin_mmi/Kconfig
@@ -13,8 +13,53 @@ menuconfig TOUCHSCREEN_GOODIX_BRL
 if TOUCHSCREEN_GOODIX_BRL
 
 config TOUCHSCREEN_GOODIX_BRL_SPI
-	bool "support SPI bus connection"
+	bool "Goodix berlin SPI bus connection"
 	help
-		Say Y here if the touchscreen is connected via SPI bus.
+	  Say Y here if the touchscreen is connected via SPI bus.
+
+config GTP_FOD
+	bool "Goodix berlin FOD"
+	help
+	  Say Y here to support FOD.
+
+config GTP_LIMIT_USE_SUPPLIER
+	bool "Goodix berlin limit use supplier"
+	default n
+	help
+	  Say Y here if you want to limit use supplier on Goodix berlin.
+
+	  If unsure, say N.
+
+config GTP_ENABLE_PM_QOS
+	bool "Goodix berlin PM QoS"
+	default n
+	help
+	  Say Y here if you want to enable PM QoS on Goodix berlin.
+
+	  If unsure, say N.
+
+config GOODIX_ESD_ENABLE
+	bool "Goodix berlin ESD"
+	default n
+	help
+	  Say Y here if you want to enable ESD on Goodix berlin.
+
+	  If unsure, say N.
+
+config GTP_LAST_TIME
+	bool "Goodix berlin timestamp"
+	default n
+	help
+	  Say Y here if you want to enable timestamp on Goodix berlin.
+
+	  If unsure, say N.
+
+config ENABLE_GTP_PALM_CANCEL
+	bool "Goodix berlin palm cancel"
+	default n
+	help
+	  Say Y here if you want to enable palm cancel on Goodix berlin.
+
+	  If unsure, say N.
 
 endif
diff --git a/drivers/input/touchscreen/synaptics_tcm2_mmi/Kbuild b/drivers/input/touchscreen/synaptics_tcm2_mmi/Kbuild
index 95d38184dc28..9baa9ac1d709 100644
--- a/drivers/input/touchscreen/synaptics_tcm2_mmi/Kbuild
+++ b/drivers/input/touchscreen/synaptics_tcm2_mmi/Kbuild
@@ -1,11 +1,6 @@
-# add -Wall to try to catch everything we can.
-EXTRA_CFLAGS += -Wall
-EXTRA_CFLAGS += \
-		-I$(ANDROID_BUILD_TOP)/motorola/kernel/modules/include \
-		-I$(ANDROID_BUILD_TOP)/motorola/kernel/modules/drivers/input/touchscreen/synaptics_tcm2_mmi \
-                -I$(ANDROID_BUILD_TOP)/motorola/kernel/modules/drivers/input/touchscreen/synaptics_tcm2_mmi/tcm
+ccflags-y += -I$(src)/tcm
 
-obj-m := synaptics_v2_mmi.o
+obj-$(CONFIG_TOUCHSCREEN_SYNA_TCM2) := synaptics_v2_mmi.o
 synaptics_v2_mmi-objs := \
 					syna_tcm2.o \
 					syna_tcm2_testing.o \
@@ -17,27 +12,7 @@ synaptics_v2_mmi-objs := \
 					tcm/synaptics_touchcom_func_reflash.o \
 					tcm/synaptics_touchcom_func_touch.o
 
-
-
-
-ifneq ($(filter m y, $(CONFIG_DRM_PANEL_NOTIFICATIONS)),)
-	EXTRA_CFLAGS += -DCONFIG_DRM_PANEL_NOTIFICATIONS
-endif
-
-ifneq ($(filter m y,$(CONFIG_TOUCHSCREEN_SYNA_TCM2_SYSFS)),)
-	EXTRA_CFLAGS += -DCONFIG_TOUCHSCREEN_SYNA_TCM2_SYSFS
-endif
-
-ifneq ($(filter m y,$(CONFIG_TOUCHSCREEN_SYNA_TCM2_TESTING)),)
-	EXTRA_CFLAGS += -DCONFIG_TOUCHSCREEN_SYNA_TCM2_TESTING
-endif
-
 ifneq ($(filter m y,$(CONFIG_INPUT_TOUCHSCREEN_MMI)),)
-       KBUILD_EXTRA_SYMBOLS += $(CURDIR)/$(KBUILD_EXTMOD)/../touchscreen_mmi/$(GKI_OBJ_MODULE_DIR)/Module.symvers
-       EXTRA_CFLAGS += -DCONFIG_INPUT_TOUCHSCREEN_MMI
-       synaptics_v2_mmi-objs += syna_ts_mmi.o
+ccflags-y += -DCONFIG_INPUT_TOUCHSCREEN_MMI
+synaptics_v2_mmi-objs += syna_ts_mmi.o
 endif
-
-
-KBUILD_EXTRA_SYMBOLS += $(CURDIR)/$(KBUILD_EXTMOD)/../touchscreen_mmi/$(GKI_OBJ_MODULE_DIR)/Module.symvers
-KBUILD_EXTRA_SYMBOLS += $(CURDIR)/$(KBUILD_EXTMOD)/../../../mmi_info/$(GKI_OBJ_MODULE_DIR)/Module.symvers
diff --git a/drivers/input/touchscreen/synaptics_tcm2_mmi/Kconfig b/drivers/input/touchscreen/synaptics_tcm2_mmi/Kconfig
index 9eb1bd134c95..b6a7a5ac2b95 100644
--- a/drivers/input/touchscreen/synaptics_tcm2_mmi/Kconfig
+++ b/drivers/input/touchscreen/synaptics_tcm2_mmi/Kconfig
@@ -3,7 +3,7 @@
 #
 menuconfig TOUCHSCREEN_SYNA_TCM2
 	tristate "Synaptics TCM touchscreen"
-	default y
+	default n
 	help
 	  Say Y here if you have a Synaptics TCM touchscreen connected
 	  to your system.
@@ -14,17 +14,6 @@ menuconfig TOUCHSCREEN_SYNA_TCM2
 
 if TOUCHSCREEN_SYNA_TCM2
 
-choice
-	default TOUCHSCREEN_SYNA_TCM2_I2C
-	prompt "Synaptics TCM bus module"
-config TOUCHSCREEN_SYNA_TCM2_I2C
-	bool "I2C"
-	depends on I2C
-config TOUCHSCREEN_SYNA_TCM2_SPI
-	bool "SPI"
-	depends on SPI_MASTER
-endchoice
-
 config TOUCHSCREEN_SYNA_TCM2_SYSFS
 	bool "Synaptics TCM device sysfs module"
 	depends on TOUCHSCREEN_SYNA_TCM2
diff --git a/drivers/regulator/wl2868c/Kbuild b/drivers/regulator/wl2868c/Kbuild
deleted file mode 100644
index c24c715f39f3..000000000000
--- a/drivers/regulator/wl2868c/Kbuild
+++ /dev/null
@@ -1,5 +0,0 @@
-EXTRA_CFLAGS += -Wall
-EXTRA_CFLAGS += -I$(TOP)/motorola/kernel/modules/include
-
-wl2868c-objs += wl2868c-regulator.o
-obj-m	+= wl2868c.o