diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index 5ae3a88b807a..8d80e5b95dc7 100644
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -914,6 +914,7 @@ config INPUT_STPMIC1_ONKEY
 	  To compile this driver as a module, choose M here: the
 	  module will be called stpmic1_onkey.
 
+source "drivers/input/misc/chipone_fps_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 1448a07619c1..3091a549a355 100644
--- a/drivers/input/misc/Makefile
+++ b/drivers/input/misc/Makefile
@@ -88,6 +88,7 @@ obj-$(CONFIG_INPUT_XEN_KBDDEV_FRONTEND)	+= xen-kbdfront.o
 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_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/chipone_fps_mmi/Kbuild b/drivers/input/misc/chipone_fps_mmi/Kbuild
index 9e3e67d9d2a1..a6e42fb8f52f 100644
--- a/drivers/input/misc/chipone_fps_mmi/Kbuild
+++ b/drivers/input/misc/chipone_fps_mmi/Kbuild
@@ -1,14 +1,3 @@
-# add -Wall to try to catch everything we can.
-EXTRA_CFLAGS += -Wall
-EXTRA_CFLAGS += -I$(ANDROID_BUILD_TOP)/motorola/kernel/modules/include
-
-prod_list := hawao penang pnangn
-find_target := $(foreach find, $(prod_list), $(findstring $(find), $(TARGET_PRODUCT)))
-find_target := $(strip $(find_target))
-$(warning find_target=$(find_target))
-ifneq ($(find_target),)
-$(warning define SUPPORT_POWER_GPIO)
-EXTRA_CFLAGS += -DSUPPORT_POWER_GPIO
-endif
-
-obj-m += fpsensor_spi_tee.o
+ccflags-$(CONFIG_INPUT_CHIPONE_FPS_MMI_SUPPORT_POWER_GPIO) += -DSUPPORT_POWER_GPIO
+
+obj-$(CONFIG_INPUT_CHIPONE_FPS_MMI) += fpsensor_spi_tee.o
diff --git a/drivers/input/misc/chipone_fps_mmi/Kconfig b/drivers/input/misc/chipone_fps_mmi/Kconfig
new file mode 100644
index 000000000000..894440f70dda
--- /dev/null
+++ b/drivers/input/misc/chipone_fps_mmi/Kconfig
@@ -0,0 +1,14 @@
+config INPUT_CHIPONE_FPS_MMI
+	tristate "MMI Chipone fingerprint sensor"
+	default n
+	help
+	  Say Y here if you wish to include support for MMI Chipone fingerprint sensor.
+	  If unsure, say N.
+
+config INPUT_CHIPONE_FPS_MMI_SUPPORT_POWER_GPIO
+	bool "Power GPIO support for MMI Chipone fingerprint sensor"
+	default n
+	depends on INPUT_CHIPONE_FPS_MMI
+	help
+	  Say Y here if you wish to include power gpio support for MMI Chipone fingerprint sensor.
+	  If unsure, say N.