From be063bb06c7a4e3e0c570da16c9153b702c88af3 Mon Sep 17 00:00:00 2001 From: Andrew Hexen Date: Mon, 19 May 2025 11:15:37 -0700 Subject: [PATCH] treewide: Setup inline build for pnangn modules Signed-off-by: Andrew Hexen Change-Id: Iba1d68089e547225f362562dbd2a575cab8802ab --- drivers/input/misc/Kconfig | 1 + drivers/input/misc/Makefile | 1 + drivers/input/misc/ets_bix_mmi/Kbuild | 20 +---- drivers/input/misc/ets_bix_mmi/Kconfig | 6 ++ drivers/input/touchscreen/Kconfig | 2 + drivers/input/touchscreen/Makefile | 1 + .../focaltech_0flash_v2_mmi/Kbuild | 51 +++--------- .../focaltech_0flash_v2_mmi/Kconfig | 78 ++++++++++++++++--- drivers/regulator/Kconfig | 2 + drivers/regulator/Makefile | 1 + drivers/regulator/ocp2138/Kbuild | 5 +- drivers/regulator/ocp2138/Kconfig | 9 +++ 12 files changed, 103 insertions(+), 74 deletions(-) create mode 100644 drivers/input/misc/ets_bix_mmi/Kconfig mode change 100755 => 100644 drivers/input/touchscreen/focaltech_0flash_v2_mmi/Kconfig create mode 100644 drivers/regulator/ocp2138/Kconfig diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig index 8d80e5b95dc7..23f068cb488f 100644 --- a/drivers/input/misc/Kconfig +++ b/drivers/input/misc/Kconfig @@ -915,6 +915,7 @@ config INPUT_STPMIC1_ONKEY module will be called stpmic1_onkey. source "drivers/input/misc/chipone_fps_mmi/Kconfig" +source "drivers/input/misc/ets_bix_mmi/Kconfig" source "drivers/input/misc/focal_fps_mmi/Kconfig" source "drivers/input/misc/fpc_fps_mmi/Kconfig" source "drivers/input/misc/goodix_fod_mmi/Kconfig" diff --git a/drivers/input/misc/Makefile b/drivers/input/misc/Makefile index 3091a549a355..f3accba29235 100644 --- a/drivers/input/misc/Makefile +++ b/drivers/input/misc/Makefile @@ -89,6 +89,7 @@ obj-$(CONFIG_INPUT_YEALINK) += yealink.o obj-$(CONFIG_INPUT_IDEAPAD_SLIDEBAR) += ideapad_slidebar.o obj-$(CONFIG_INPUT_CHIPONE_FPS_MMI) += chipone_fps_mmi/ +obj-$(CONFIG_INPUT_ETS_BIX_MMI) += ets_bix_mmi/ obj-$(CONFIG_INPUT_FOCAL_FPS_MMI) += focal_fps_mmi/ obj-$(CONFIG_INPUT_MISC_FPC1020) += fpc_fps_mmi/ obj-$(CONFIG_INPUT_GOODIX_FOD_MMI) += goodix_fod_mmi/ diff --git a/drivers/input/misc/ets_bix_mmi/Kbuild b/drivers/input/misc/ets_bix_mmi/Kbuild index de3c7a00bb43..bb4626b11690 100644 --- a/drivers/input/misc/ets_bix_mmi/Kbuild +++ b/drivers/input/misc/ets_bix_mmi/Kbuild @@ -1,21 +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/ets_bix_mmi - -ifneq ($(filter m y,$(CONFIG_EGIS_PANEL_NOTIFICATIONS)),) - EXTRA_CFLAGS += -DCONFIG_PANEL_NOTIFICATIONS -endif - -ifneq ($(filter m y,$(CONFIG_EGIS_DRM_PANEL_NOTIFICATIONS)),) - EXTRA_CFLAGS += -DCONFIG_DRM_PANEL_NOTIFICATIONS -endif -#ifneq ($(filter m y,$(CONFIG_ET721_FOD)),) -# EXTRA_CFLAGS += -DET721_FOD -#endif - ets_bix_mmi-y += etxxx_fp.o - -obj-m += ets_bix_mmi.o - +obj-$(CONFIG_INPUT_ETS_BIX_MMI) += ets_bix_mmi.o diff --git a/drivers/input/misc/ets_bix_mmi/Kconfig b/drivers/input/misc/ets_bix_mmi/Kconfig new file mode 100644 index 000000000000..f9edc28dd5ec --- /dev/null +++ b/drivers/input/misc/ets_bix_mmi/Kconfig @@ -0,0 +1,6 @@ +config INPUT_ETS_BIX_MMI + tristate "MMI ETS BIX fingerprint sensor" + default n + help + Say Y here if you wish to include support for MMI ETS BIX fingerprint sensor. + If unsure, say N. diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig index 3be770e1927c..7e234defdc6b 100644 --- a/drivers/input/touchscreen/Kconfig +++ b/drivers/input/touchscreen/Kconfig @@ -1335,6 +1335,8 @@ source "drivers/input/touchscreen/nt36xxx/Kconfig" source "drivers/input/touchscreen/chipone_tddi_v2_mmi/Kconfig" +source "drivers/input/touchscreen/focaltech_0flash_v2_mmi/Kconfig" + source "drivers/input/touchscreen/focaltech_touch_v3/Kconfig" source "drivers/input/touchscreen/goodix_berlin_mmi/Kconfig" diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Makefile index f16b0afaf017..32a9a17a8867 100644 --- a/drivers/input/touchscreen/Makefile +++ b/drivers/input/touchscreen/Makefile @@ -117,6 +117,7 @@ obj-$(CONFIG_TOUCHSCREEN_SYNAPTICS_DSX) += synaptics_dsx/ obj-$(CONFIG_TOUCHSCREEN_NT36XXX) += nt36xxx/ obj-$(CONFIG_TOUCHSCREEN_CHIPONE_V2_MMI) += chipone_tddi_v2_mmi/ +obj-$(CONFIG_TOUCHSCREEN_FTS_0FLASH_MMI_V2) += focaltech_0flash_v2_mmi/ obj-$(CONFIG_TOUCHSCREEN_FTS_V3) += focaltech_touch_v3/ obj-$(CONFIG_TOUCHSCREEN_GOODIX_BRL_MMI) += goodix_berlin_mmi/ obj-$(CONFIG_TOUCHSCREEN_ILITEK_V3_MMI) += ilitek_v3_mmi/ diff --git a/drivers/input/touchscreen/focaltech_0flash_v2_mmi/Kbuild b/drivers/input/touchscreen/focaltech_0flash_v2_mmi/Kbuild index 93714d15bba8..d9a4cf0449e9 100644 --- a/drivers/input/touchscreen/focaltech_0flash_v2_mmi/Kbuild +++ b/drivers/input/touchscreen/focaltech_0flash_v2_mmi/Kbuild @@ -1,10 +1,14 @@ -# 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_0flash_v2_mmi \ - -I$(ANDROID_BUILD_TOP)/motorola/kernel/modules/drivers/input/touchscreen/focaltech_0flash_v2_mmi/include +obj-$(CONFIG_TOUCHSCREEN_FTS_0FLASH_MMI_V2) += focaltech_0flash_v2_mmi.o + +ccflags-$(CONFIG_TOUCHSCREEN_FTS_0FLASH_MMI_V2_ENABLE_DOUBLE_TAP) += -DFOCALTECH_SENSOR_EN +ccflags-$(CONFIG_TOUCHSCREEN_FTS_0FLASH_MMI_V2_NOTIFY_TOUCH_STATE) += -DFTS_SET_TOUCH_STATE +ccflags-$(CONFIG_TOUCHSCREEN_FTS_0FLASH_MMI_V2_ESD_EN) += -DFOCALTECH_ESD_EN +ccflags-$(CONFIG_TOUCHSCREEN_FTS_0FLASH_MMI_V2_PANEL_NOTIFICATIONS) += -DFOCALTECH_CONFIG_PANEL_NOTIFICATIONS +ccflags-$(CONFIG_TOUCHSCREEN_FTS_0FLASH_MMI_V2_DEBUG_EN) += -DFOCALTECH_DEBUG_EN +ccflags-$(CONFIG_TOUCHSCREEN_FTS_0FLASH_MMI_V2_IC_NAME_FT8057) += -DCONFIG_INPUT_FOCALTECH_0FLASH_MMI_IC_NAME_FT8057 +ccflags-$(CONFIG_TOUCHSCREEN_FTS_0FLASH_MMI_V2_PINCTRL_EN) += -DFOCALTECH_PINCTRL_EN +ccflags-$(CONFIG_TOUCHSCREEN_FTS_0FLASH_MMI_V2_LAST_TIME) += -DFTS_LAST_TIME_EN -obj-m := focaltech_0flash_v2_mmi.o focaltech_0flash_v2_mmi-objs += focaltech_core.o focaltech_0flash_v2_mmi-objs += focaltech_esdcheck.o focaltech_0flash_v2_mmi-objs += focaltech_ex_fun.o @@ -13,38 +17,3 @@ focaltech_0flash_v2_mmi-objs += focaltech_flash.o focaltech_0flash_v2_mmi-objs += focaltech_gesture.o focaltech_0flash_v2_mmi-objs += focaltech_point_report_check.o focaltech_0flash_v2_mmi-objs += focaltech_spi.o - -ifneq ($(filter m y,$(CONFIG_INPUT_FOCALTECH_0FLASH_MMI_ENABLE_DOUBLE_TAP)),) - EXTRA_CFLAGS += -DFOCALTECH_SENSOR_EN - KBUILD_EXTRA_SYMBOLS += $(CURDIR)/$(KBUILD_EXTMOD)/../../../sensors/$(GKI_OBJ_MODULE_DIR)/Module.symvers -endif - -ifneq ($(filter m y,$(CONFIG_INPUT_FOCALTECH_0FLASH_MMI_NOTIFY_TOUCH_STATE)),) - EXTRA_CFLAGS += -DFTS_SET_TOUCH_STATE -endif - -ifneq ($(filter m y,$(CONFIG_INPUT_FOCALTECH_ESD_EN)),) -EXTRA_CFLAGS += -DFOCALTECH_ESD_EN -endif - -ifneq ($(filter m y,$(CONFIG_INPUT_FOCALTECH_PANEL_NOTIFICATIONS)),) -EXTRA_CFLAGS += -DFOCALTECH_CONFIG_PANEL_NOTIFICATIONS -endif - -ifneq ($(filter m y,$(CONFIG_INPUT_FOCALTECH_DEBUG_EN)),) -EXTRA_CFLAGS += -DFOCALTECH_DEBUG_EN -endif - -ifneq ($(filter ft8057,$(CONFIG_INPUT_FOCALTECH_0FLASH_MMI_IC_NAME)),) -EXTRA_CFLAGS += -DCONFIG_INPUT_FOCALTECH_0FLASH_MMI_IC_NAME_FT8057 -endif - -ifneq ($(filter m y,$(CONFIG_INPUT_FOCALTECH_PINCTRL_EN)),) -EXTRA_CFLAGS += -DFOCALTECH_PINCTRL_EN -endif - -ifneq ($(filter m y,$(CONFIG_FOCALTECH_LAST_TIME)),) - EXTRA_CFLAGS += -DFTS_LAST_TIME_EN -endif - -KBUILD_EXTRA_SYMBOLS += $(CURDIR)/../../kernel/msm-$(MODULE_KERNEL_VERSION)/Module.symvers diff --git a/drivers/input/touchscreen/focaltech_0flash_v2_mmi/Kconfig b/drivers/input/touchscreen/focaltech_0flash_v2_mmi/Kconfig old mode 100755 new mode 100644 index e2bf1085bbf0..c3b6c5238bb6 --- a/drivers/input/touchscreen/focaltech_0flash_v2_mmi/Kconfig +++ b/drivers/input/touchscreen/focaltech_0flash_v2_mmi/Kconfig @@ -2,15 +2,73 @@ # Focaltech Touchscreen driver configuration # -config TOUCHSCREEN_FTS - bool "Focaltech Touchscreen" - default n - help - Say Y here if you have Focaltech touch panel. - If unsure, say N. +config TOUCHSCREEN_FTS_0FLASH_MMI_V2 + tristate "Focaltech 0flash MMI Touchscreen V2" + default n + help + Say Y here if you have Focaltech 0flash MMI V2 touch panel. + If unsure, say N. -config TOUCHSCREEN_FTS_DIRECTORY - string "Focaltech ts directory name" - default "focaltech_touch" - depends on TOUCHSCREEN_FTS +config TOUCHSCREEN_FTS_0FLASH_MMI_V2_ENABLE_DOUBLE_TAP + bool "Enable double tap" + depends on TOUCHSCREEN_FTS_0FLASH_MMI_V2 + default n + help + Say Y here to enable double tap functionality on Focaltech 0flash MMI V2 touch panel. + If unsure, say N. +config TOUCHSCREEN_FTS_0FLASH_MMI_V2_NOTIFY_TOUCH_STATE + bool "Enable touch state" + depends on TOUCHSCREEN_FTS_0FLASH_MMI_V2 + default n + help + Say Y here to enable touch state reporting on Focaltech 0flash MMI V2 touch panel. + If unsure, say N. + +config TOUCHSCREEN_FTS_0FLASH_MMI_V2_ESD_EN + bool "Enable ESD" + depends on TOUCHSCREEN_FTS_0FLASH_MMI_V2 + default n + help + Say Y here to enable ESD functionality on Focaltech 0flash MMI V2 touch panel. + If unsure, say N. + +config TOUCHSCREEN_FTS_0FLASH_MMI_V2_PANEL_NOTIFICATIONS + bool "Enable panel notifications" + depends on TOUCHSCREEN_FTS_0FLASH_MMI_V2 + default n + help + Say Y here to enable panel notifications on Focaltech 0flash MMI V2 touch panel. + If unsure, say N. + +config TOUCHSCREEN_FTS_0FLASH_MMI_V2_DEBUG_EN + bool "Enable debug" + depends on TOUCHSCREEN_FTS_0FLASH_MMI_V2 + default n + help + Say Y here to enable debug functionality on Focaltech 0flash MMI V2 touch panel. + If unsure, say N. + +config TOUCHSCREEN_FTS_0FLASH_MMI_V2_IC_NAME_FT8057 + bool "Enable FT8057 IC" + depends on TOUCHSCREEN_FTS_0FLASH_MMI_V2 + default n + help + Say Y here to enable FT8057 IC on Focaltech 0flash MMI V2 touch panel. + If unsure, say N. + +config TOUCHSCREEN_FTS_0FLASH_MMI_V2_PINCTRL_EN + bool "Enable pin control" + depends on TOUCHSCREEN_FTS_0FLASH_MMI_V2 + default n + help + Say Y here to enable pin control functionality on Focaltech 0flash MMI V2 touch panel. + If unsure, say N. + +config TOUCHSCREEN_FTS_0FLASH_MMI_V2_LAST_TIME + bool "Enable last time" + depends on TOUCHSCREEN_FTS_0FLASH_MMI_V2 + default n + help + Say Y here to enable last time functionality on Focaltech 0flash MMI V2 touch panel. + If unsure, say N. diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig index fc509b133964..7a7c18a1bfbf 100644 --- a/drivers/regulator/Kconfig +++ b/drivers/regulator/Kconfig @@ -1230,6 +1230,8 @@ config VIRTIO_REGULATOR regulator for pass through peripheral devices via regulator backend in host. +source "drivers/regulator/ocp2138/Kconfig" + source "drivers/regulator/wl2864c/Kconfig" source "drivers/regulator/wl2866d/Kconfig" diff --git a/drivers/regulator/Makefile b/drivers/regulator/Makefile index 6f26ec7de99f..d078ca8d4e66 100644 --- a/drivers/regulator/Makefile +++ b/drivers/regulator/Makefile @@ -151,6 +151,7 @@ obj-$(CONFIG_REGULATOR_RPMH) += rpmh-regulator.o obj-$(CONFIG_REGULATOR_STUB) += stub-regulator.o obj-$(CONFIG_VIRTIO_REGULATOR) += virtio_regulator.o +obj-$(CONFIG_REGULATOR_OCP2138) += ocp2138/ obj-$(CONFIG_REGULATOR_WL2864C) += wl2864c/ obj-$(CONFIG_REGULATOR_WL2866D) += wl2866d/ obj-$(CONFIG_REGULATOR_WL2868C) += wl2868c/ diff --git a/drivers/regulator/ocp2138/Kbuild b/drivers/regulator/ocp2138/Kbuild index 4d5b3eb7c78e..6133e0cc083c 100644 --- a/drivers/regulator/ocp2138/Kbuild +++ b/drivers/regulator/ocp2138/Kbuild @@ -1,4 +1 @@ -EXTRA_CFLAGS += -Wall -EXTRA_CFLAGS += -I$(TOP)/motorola/kernel/modules/include - -obj-m += ocp2138.o +obj-$(CONFIG_REGULATOR_OCP2138) += ocp2138.o diff --git a/drivers/regulator/ocp2138/Kconfig b/drivers/regulator/ocp2138/Kconfig new file mode 100644 index 000000000000..220fa68263a6 --- /dev/null +++ b/drivers/regulator/ocp2138/Kconfig @@ -0,0 +1,9 @@ +config REGULATOR_OCP2138 + tristate "OCP2138 REGULATOR" + default n + help + Say Y here if you have a OCP2138 compatible + device connected. + + This driver can also be built as a module. If so, the module + will be called wl2868c.