diff --git a/drivers/Kconfig b/drivers/Kconfig
index 3f15718000a6..b373831ebeb3 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -246,4 +246,6 @@ source "drivers/tzlog_dump/Kconfig"
 source "drivers/watchdog_cpu_ctx/Kconfig"
 
 source "drivers/watchdogtest/Kconfig"
+
+source "drivers/backlight/Kconfig"
 endmenu
diff --git a/drivers/Makefile b/drivers/Makefile
index a687b87ad819..e19414ae1150 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -200,3 +200,4 @@ obj-$(CONFIG_MOTO_F_USBNET)	+= moto_f_usbnet/
 obj-$(CONFIG_TZLOG_DUMP)	+= tzlog_dump/
 obj-$(CONFIG_WATCHDOG_CPU_CTX)	+= watchdog_cpu_ctx/
 obj-$(CONFIG_WATCHDOGTEST)	+= watchdogtest/
+obj-y				+= backlight/
diff --git a/drivers/backlight/Kconfig b/drivers/backlight/Kconfig
new file mode 100644
index 000000000000..d920459fa3aa
--- /dev/null
+++ b/drivers/backlight/Kconfig
@@ -0,0 +1,3 @@
+source "drivers/backlight/aw99703/Kconfig"
+
+source "drivers/backlight/lm3697/Kconfig"
diff --git a/drivers/backlight/Makefile b/drivers/backlight/Makefile
new file mode 100644
index 000000000000..39b3150b55f9
--- /dev/null
+++ b/drivers/backlight/Makefile
@@ -0,0 +1,2 @@
+obj-$(CONFIG_LEDS_AW99703)	+= aw99703/
+obj-$(CONFIG_LEDS_LM3697)	+= lm3697/
diff --git a/drivers/backlight/aw99703/Kbuild b/drivers/backlight/aw99703/Kbuild
index 0772225e16dc..68f832c8d9d0 100644
--- a/drivers/backlight/aw99703/Kbuild
+++ b/drivers/backlight/aw99703/Kbuild
@@ -1,5 +1 @@
-# add -Wall to try to catch everything we can.
-EXTRA_CFLAGS += -Wall
-EXTRA_CFLAGS += -I$(TOP)/motorola/kernel/modules/include
-
-obj-m += leds_aw99703.o
+obj-$(CONFIG_LEDS_AW99703) += leds_aw99703.o
diff --git a/drivers/backlight/aw99703/Kconfig b/drivers/backlight/aw99703/Kconfig
new file mode 100644
index 000000000000..9f0eb7051235
--- /dev/null
+++ b/drivers/backlight/aw99703/Kconfig
@@ -0,0 +1,11 @@
+config LEDS_AW99703
+	tristate "AW99703 LED driver"
+	default n
+	help
+	  Say Y here if you have AW99703 LED in
+	  your system.
+
+	  If unsure, say N.
+
+	  To compile this driver as a module, choose M here: the
+	  module will be called leds_aw99703.
diff --git a/drivers/backlight/lm3697/Kbuild b/drivers/backlight/lm3697/Kbuild
index 3204c539185a..984fd2b588b3 100644
--- a/drivers/backlight/lm3697/Kbuild
+++ b/drivers/backlight/lm3697/Kbuild
@@ -1,8 +1,4 @@
-# add -Wall to try to catch everything we can.
-EXTRA_CFLAGS += -Wall
-EXTRA_CFLAGS += -I$(TOP)/motorola/kernel/modules/include
-
-obj-m := leds_lm3697.o
+obj-$(CONFIG_LEDS_LM3697) := leds_lm3697.o
 leds_lm3697-objs += ti_lm3697.o
 leds_lm3697-objs += ti_lm3697_backlight.o
 leds_lm3697-objs += ti_lm3697_backlight_data.o
diff --git a/drivers/backlight/lm3697/Kconfig b/drivers/backlight/lm3697/Kconfig
new file mode 100644
index 000000000000..168b8b8c2cd1
--- /dev/null
+++ b/drivers/backlight/lm3697/Kconfig
@@ -0,0 +1,11 @@
+config LEDS_LM3697
+	tristate "LM3697 LED driver"
+	default n
+	help
+	  Say Y here if you have LM3697 LED in
+	  your system.
+
+	  If unsure, say N.
+
+	  To compile this driver as a module, choose M here: the
+	  module will be called leds_lm3697.
diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index 9d9ddfa52c8e..f004d7f45b8b 100644
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -885,6 +885,7 @@ config INPUT_SC27XX_VIBRA
 	  To compile this driver as a module, choose M here. The module will
 	  be called sc27xx_vibra.
 
+source "drivers/input/misc/ets_bix_mmi/Kconfig"
 source "drivers/input/misc/ets_fps_mmi/Kconfig"
 source "drivers/input/misc/fpc_fps_mmi/Kconfig"
 source "drivers/input/misc/qpnp_power_on_mmi/Kconfig"
diff --git a/drivers/input/misc/Makefile b/drivers/input/misc/Makefile
index ec1e38775d04..9a555f0b0ec7 100644
--- a/drivers/input/misc/Makefile
+++ b/drivers/input/misc/Makefile
@@ -86,6 +86,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_EGISTEC_BIX)		+= ets_bix_mmi/
 obj-$(CONFIG_INPUT_EGISTEC_FPS)		+= ets_fps_mmi/
 obj-$(CONFIG_INPUT_MISC_FPC1020)	+= fpc_fps_mmi/
 obj-$(CONFIG_INPUT_QPNP_POWER_ON_MMI)	+= qpnp_power_on_mmi/
diff --git a/drivers/input/misc/ets_bix_mmi/Kbuild b/drivers/input/misc/ets_bix_mmi/Kbuild
index de3c7a00bb43..b7ace5d074d9 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_EGISTEC_BIX) += 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..985783c71877
--- /dev/null
+++ b/drivers/input/misc/ets_bix_mmi/Kconfig
@@ -0,0 +1,6 @@
+config INPUT_EGISTEC_BIX
+	tristate "Egistec fingerprint sensor BIX MMI"
+	default n
+	help
+	 Say Y here if you wish to include support for BIX MMI EGIS finger print sensor.
+	 If unsure, say N.
diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index 1147063b22b1..a7dcb0dc0b2c 100644
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -1376,6 +1376,10 @@ source "drivers/input/touchscreen/touchscreen_mmi/Kconfig"
 
 source "drivers/input/touchscreen/stmicro_mmi/Kconfig"
 
+source "drivers/input/touchscreen/focaltech_0flash_v2_mmi/Kconfig"
+
 source "drivers/input/touchscreen/focaltech_v2_mmi/Kconfig"
 
+source "drivers/input/touchscreen/ili9882_mmi/Kconfig"
+
 endif
diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Makefile
index 79ef8b318456..afac207fafe1 100644
--- a/drivers/input/touchscreen/Makefile
+++ b/drivers/input/touchscreen/Makefile
@@ -120,4 +120,6 @@ obj-$(CONFIG_TOUCHSCREEN_HIMAX_CHIPSET)	+= hxchipset/
 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_INPUT_TOUCHSCREEN_FOCALTECH_0FLASH_V2_MMI) += focaltech_0flash_v2_mmi/
 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_0flash_v2_mmi/Kbuild b/drivers/input/touchscreen/focaltech_0flash_v2_mmi/Kbuild
index 93714d15bba8..7aa693b1fa46 100644
--- a/drivers/input/touchscreen/focaltech_0flash_v2_mmi/Kbuild
+++ b/drivers/input/touchscreen/focaltech_0flash_v2_mmi/Kbuild
@@ -1,10 +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/focaltech_0flash_v2_mmi \
-		-I$(ANDROID_BUILD_TOP)/motorola/kernel/modules/drivers/input/touchscreen/focaltech_0flash_v2_mmi/include
+ccflags-y += -I$(srctree)/drivers/input/touchscreen/focaltech_0flash_v2_mmi/include
 
-obj-m := focaltech_0flash_v2_mmi.o
+obj-$(CONFIG_INPUT_TOUCHSCREEN_FOCALTECH_0FLASH_V2_MMI) := 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
@@ -14,37 +10,17 @@ 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
+ccflags-$(CONFIG_INPUT_TOUCHSCREEN_FOCALTECH_0FLASH_V2_MMI_ENABLE_DOUBLE_TAP) += -DFOCALTECH_SENSOR_EN
+ccflags-$(CONFIG_INPUT_TOUCHSCREEN_FOCALTECH_0FLASH_V2_MMI_NOTIFY_TOUCH_STATE) += -DFTS_SET_TOUCH_STATE
+ccflags-$(CONFIG_INPUT_TOUCHSCREEN_FOCALTECH_0FLASH_V2_MMI_ESD_EN) += -DFOCALTECH_ESD_EN
+ccflags-$(CONFIG_INPUT_TOUCHSCREEN_FOCALTECH_0FLASH_V2_MMI_PANEL_NOTIFICATIONS) += -DFOCALTECH_CONFIG_PANEL_NOTIFICATIONS
+ccflags-$(CONFIG_INPUT_TOUCHSCREEN_FOCALTECH_0FLASH_V2_MMI_DEBUG_EN) += -DFOCALTECH_DEBUG_EN
 
 ifneq ($(filter ft8057,$(CONFIG_INPUT_FOCALTECH_0FLASH_MMI_IC_NAME)),)
-EXTRA_CFLAGS += -DCONFIG_INPUT_FOCALTECH_0FLASH_MMI_IC_NAME_FT8057
+ccflags-y += -DCONFIG_INPUT_FOCALTECH_0FLASH_MMI_IC_NAME_FT8057
+else
+ccflags-y += -DCONFIG_INPUT_FOCALTECH_0FLASH_MMI_IC_NAME_FT8726
 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
+ccflags-$(CONFIG_INPUT_TOUCHSCREEN_FOCALTECH_0FLASH_V2_MMI_PINCTRL_EN) += -DFOCALTECH_PINCTRL_EN
+ccflags-$(CONFIG_INPUT_TOUCHSCREEN_FOCALTECH_0FLASH_V2_MMI_LAST_TIME) += -DFTS_LAST_TIME_EN
diff --git a/drivers/input/touchscreen/focaltech_0flash_v2_mmi/Kconfig b/drivers/input/touchscreen/focaltech_0flash_v2_mmi/Kconfig
index e2bf1085bbf0..0d9fcbf4f1ef 100755
--- a/drivers/input/touchscreen/focaltech_0flash_v2_mmi/Kconfig
+++ b/drivers/input/touchscreen/focaltech_0flash_v2_mmi/Kconfig
@@ -2,15 +2,80 @@
 # Focaltech Touchscreen driver configuration
 #
 
-config TOUCHSCREEN_FTS
-    bool "Focaltech Touchscreen"
+config INPUT_TOUCHSCREEN_FOCALTECH_0FLASH_V2_MMI
+    tristate "FocalTech Touchscreen Driver 0flash V2 MMI"
     default n
     help
-      Say Y here if you have Focaltech touch panel.
+      Say Y here if you wish to include support for FocalTech Touchscreen 0flash V2 MMI.
+
       If unsure, say N.
 
-config TOUCHSCREEN_FTS_DIRECTORY
-    string "Focaltech ts directory name"
-    default "focaltech_touch"
-    depends on TOUCHSCREEN_FTS
+      To compile this driver as a module, choose M here: the
+      module will be called focaltech_0flash_v2_mmi.
 
+if INPUT_TOUCHSCREEN_FOCALTECH_0FLASH_V2_MMI
+
+config INPUT_TOUCHSCREEN_FOCALTECH_0FLASH_V2_MMI_ENABLE_DOUBLE_TAP
+    bool "FocalTech 0flash V2 MMI Double tap"
+    depends on SENSORS_CLASS
+    default n
+    help
+      Say Y here if you want to have Double tap support on Moto FocalTech 0flash V2.
+
+      If unsure, say N.
+
+config INPUT_TOUCHSCREEN_FOCALTECH_0FLASH_V2_MMI_NOTIFY_TOUCH_STATE
+    bool "FocalTech 0flash V2 MMI Notify touch state"
+    default n
+    help
+      Say Y here if you want to have Notify touch state support on Moto FocalTech 0flash V2.
+
+      If unsure, say N.
+
+config INPUT_TOUCHSCREEN_FOCALTECH_0FLASH_V2_MMI_ESD_EN
+    bool "FocalTech 0flash V2 MMI ESD"
+    default n
+    help
+      Say Y here if you want to have ESD support on Moto FocalTech 0flash V2.
+
+      If unsure, say N.
+
+config INPUT_TOUCHSCREEN_FOCALTECH_0FLASH_V2_MMI_PANEL_NOTIFICATIONS
+    bool "FocalTech 0flash V2 MMI Panel notifications"
+    default n
+    help
+      Say Y here if you want to have panel notifications support on Moto FocalTech 0flash V2.
+
+      If unsure, say N.
+
+config INPUT_TOUCHSCREEN_FOCALTECH_0FLASH_V2_MMI_DEBUG_EN
+    bool "FocalTech 0flash V2 MMI Debug"
+    default n
+    help
+      Say Y here if you want to have debug support on Moto FocalTech 0flash V2.
+
+      If unsure, say N.
+
+config INPUT_TOUCHSCREEN_FOCALTECH_0FLASH_V2_MMI_IC_NAME
+    string "FocalTech 0flash V2 MMI IC Name"
+    default "ft8726"
+    help
+      Provide the IC name of the FocalTech 0flash V2 MMI device.
+
+config INPUT_TOUCHSCREEN_FOCALTECH_0FLASH_V2_MMI_PINCTRL_EN
+    bool "FocalTech 0flash V2 MMI Pinctrl"
+    default n
+    help
+      Say Y here if you want to have pinctrl support on Moto FocalTech 0flash V2.
+
+      If unsure, say N.
+
+config INPUT_TOUCHSCREEN_FOCALTECH_0FLASH_V2_MMI_LAST_TIME
+    bool "FocalTech 0flash V2 MMI Timestamp"
+    default n
+    help
+      Say Y here if you want to have timestamp support on Moto FocalTech 0flash V2.
+
+      If unsure, say N.
+
+endif
diff --git a/drivers/input/touchscreen/ili9882_mmi/Kbuild b/drivers/input/touchscreen/ili9882_mmi/Kbuild
index f3a8915dc471..442c6f5ba89e 100644
--- a/drivers/input/touchscreen/ili9882_mmi/Kbuild
+++ b/drivers/input/touchscreen/ili9882_mmi/Kbuild
@@ -1,68 +1,20 @@
-# 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/ili9882_mmi \
-		-I$(ANDROID_BUILD_TOP)/motorola/kernel/modules/drivers/input/touchscreen/ili9882_mmi/firmware
+ccflags-y += -I$(srctree)/drivers/input/touchscreen/ili9882_mmi/firmware
 
-ifeq ($(filter m y, $(CONFIG_TOUCHSCREEN_ILITEK_CHIPSET)),)
-	obj-m += ili9882_mmi.o
-endif
+obj-$(CONFIG_INPUT_TOUCHSCREEN_ILI_9882_MMI) += ili9882_mmi.o
 
-ifneq ($(filter m y,$(CONFIG_INPUT_ILI_0FLASH_MMI_ENABLE_DOUBLE_TAP)),)
-	EXTRA_CFLAGS += -DILI_SENSOR_EN
-	KBUILD_EXTRA_SYMBOLS += $(CURDIR)/$(KBUILD_EXTMOD)/../../../sensors/$(GKI_OBJ_MODULE_DIR)/Module.symvers
-endif
-
-ifneq ($(filter m y,$(CONFIG_INPUT_ILI_0FLASH_MMI_NOTIFY_TOUCH_STATE)),)
-	EXTRA_CFLAGS += -DILI_SET_TOUCH_STATE
-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_ILI_PANEL_NOTIFICATIONS)),)
-EXTRA_CFLAGS += -DILI_CONFIG_PANEL_NOTIFICATIONS
-endif
-ifneq ($(filter m y,$(CONFIG_ILITEK_RESUME_BY_DDI)),)
-EXTRA_CFLAGS += -DILI_CONFIG_RESUME_BY_DDI
-endif
-ifneq ($(filter m y,$(CONFIG_ILITEK_FW_PANEL)),)
-EXTRA_CFLAGS += -DILI_FW_PANEL
-endif
-ifneq ($(filter m y,$(CONFIG_ILITEK_SUSPEND_PWROFF)),)
-EXTRA_CFLAGS += -DILI_SUSPEND_PWROFF
-endif
-ifneq ($(filter m y,$(CONFIG_ILITEK_CHARGER)),)
-EXTRA_CFLAGS += -DILI_CONFIG_CHARGER
-endif
-ifneq ($(filter m y,$(CONFIG_ILITEK_ESD)),)
-EXTRA_CFLAGS += -DILI_CONFIG_ESD
-endif
-ifneq ($(filter m y,$(CONFIG_ILITEK_GESTURE)),)
-EXTRA_CFLAGS += -DILI_CONFIG_GESTURE
-endif
-
-ifneq ($(filter m y,$(CONFIG_INPUT_ILITEK_MMI_PEN_NOTIFIER)),)
-	KBUILD_EXTRA_SYMBOLS += $(CURDIR)/$(KBUILD_EXTMOD)/../../../misc/pen/$(GKI_OBJ_MODULE_DIR)/Module.symvers
-	EXTRA_CFLAGS += -DILITEK_PEN_NOTIFIER
-endif
-
-ifneq ($(filter m y,$(CONFIG_ILITEK_PANEL_GESTURE)),)
-EXTRA_CFLAGS += -DILI_CONFIG_PANEL_GESTURE
-endif
-
-ifneq ($(filter m y,$(CONFIG_DRM_PANEL_EVENT_NOTIFICATIONS)),)
-    EXTRA_CFLAGS += -DCONFIG_DRM_PANEL_EVENT_NOTIFICATIONS
-endif
-
-ifneq ($(filter m y,$(CONFIG_ILITEK_PASSIVE_PEN)),)
-EXTRA_CFLAGS += -DILI_PASSIVE_PEN
-endif
-
-ifneq ($(filter m y,$(CONFIG_ILI_TOUCH_LAST_TIME)),)
-	EXTRA_CFLAGS += -DILI_TOUCH_LAST_TIME
-endif
+ccflags-$(CONFIG_INPUT_TOUCHSCREEN_ILI_9882_MMI_ENABLE_DOUBLE_TAP) += -DILI_SENSOR_EN
+ccflags-$(CONFIG_INPUT_TOUCHSCREEN_ILI_9882_MMI_NOTIFY_TOUCH_STATE) += -DILI_SET_TOUCH_STATE
+ccflags-$(CONFIG_INPUT_TOUCHSCREEN_ILI_9882_MMI_PANEL_NOTIFICATIONS) += -DILI_CONFIG_PANEL_NOTIFICATIONS
+ccflags-$(CONFIG_INPUT_TOUCHSCREEN_ILI_9882_MMI_RESUME_BY_DDI) += -DILI_CONFIG_RESUME_BY_DDI
+ccflags-$(CONFIG_INPUT_TOUCHSCREEN_ILI_9882_MMI_FW_PANEL) += -DILI_FW_PANEL
+ccflags-$(CONFIG_INPUT_TOUCHSCREEN_ILI_9882_MMI_SUSPEND_PWROFF) += -DILI_SUSPEND_PWROFF
+ccflags-$(CONFIG_INPUT_TOUCHSCREEN_ILI_9882_MMI_CHARGER) += -DILI_CONFIG_CHARGER
+ccflags-$(CONFIG_INPUT_TOUCHSCREEN_ILI_9882_MMI_ESD) += -DILI_CONFIG_ESD
+ccflags-$(CONFIG_INPUT_TOUCHSCREEN_ILI_9882_MMI_PEN_NOTIFIER) += -DILITEK_PEN_NOTIFIER
+ccflags-$(CONFIG_INPUT_TOUCHSCREEN_ILI_9882_MMI_GESTURE) += -DILI_CONFIG_GESTURE
+ccflags-$(CONFIG_INPUT_TOUCHSCREEN_ILI_9882_MMI_PANEL_GESTURE) += -DILI_CONFIG_PANEL_GESTURE
+ccflags-$(CONFIG_INPUT_TOUCHSCREEN_ILI_9882_MMI_PASSIVE_PEN) += -DILI_PASSIVE_PEN
+ccflags-$(CONFIG_INPUT_TOUCHSCREEN_ILI_9882_MMI_LAST_TIME) += -DILI_TOUCH_LAST_TIME
 
 ili9882_mmi-objs += ili9882.o
 ili9882_mmi-objs += ili9882_spi.o
@@ -72,14 +24,11 @@ ili9882_mmi-objs += ili9882_touch.o
 ili9882_mmi-objs += ili9882_mp.o
 ili9882_mmi-objs += ili9882_hostdl.o
 ili9882_mmi-objs += ili9882_node.o
+
 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
+    ccflags-y += -DCONFIG_INPUT_TOUCHSCREEN_MMI
     ili9882_mmi-objs += ili_mmi_class.o
 endif
-KBUILD_EXTRA_SYMBOLS += $(CURDIR)/../../kernel/msm-$(MODULE_KERNEL_VERSION)/Module.symvers
 
-ifneq ($(filter m y,$(CONFIG_GTP_DDA_STYLUS)),)
-    EXTRA_CFLAGS += -DCONFIG_MOTO_DDA_PASSIVESTYLUS
-    ili9882_mmi-objs += moto_ts_dda.o
-endif
+ccflags-$(CONFIG_GTP_DDA_STYLUS) += -DCONFIG_MOTO_DDA_PASSIVESTYLUS
+ili9882_mmi-$(CONFIG_GTP_DDA_STYLUS) += moto_ts_dda.o
diff --git a/drivers/input/touchscreen/ili9882_mmi/Kconfig b/drivers/input/touchscreen/ili9882_mmi/Kconfig
new file mode 100644
index 000000000000..fe9cfb1d2b04
--- /dev/null
+++ b/drivers/input/touchscreen/ili9882_mmi/Kconfig
@@ -0,0 +1,119 @@
+config INPUT_TOUCHSCREEN_ILI_9882_MMI
+    tristate "Ilitek Touchscreen Driver 9882 MMI"
+    default n
+    help
+      Say Y here if you wish to include support for Ilitek Touchscreen Driver 9882 MMI.
+
+      If unsure, say N.
+
+      To compile this driver as a module, choose M here: the
+      module will be called ili9882_mmi.
+
+if INPUT_TOUCHSCREEN_ILI_9882_MMI
+
+config INPUT_TOUCHSCREEN_ILI_9882_MMI_ENABLE_DOUBLE_TAP
+    bool "Ilitek Touchscreen Driver 9882 MMI Double tap"
+    depends on SENSORS_CLASS
+    default n
+    help
+      Say Y here if you want to have double tap support on Ilitek 9882 MMI.
+
+      If unsure, say N.
+
+config INPUT_TOUCHSCREEN_ILI_9882_MMI_NOTIFY_TOUCH_STATE
+    bool "Ilitek Touchscreen Driver 9882 MMI Touch state"
+    default n
+    help
+      Say Y here if you want to have touch state support on Ilitek 9882 MMI.
+
+      If unsure, say N.
+
+config INPUT_TOUCHSCREEN_ILI_9882_MMI_PANEL_NOTIFICATIONS
+    bool "Ilitek Touchscreen Driver 9882 MMI Panel notifications"
+    default n
+    help
+      Say Y here if you want to have panel notifications support on Ilitek 9882 MMI.
+
+      If unsure, say N.
+
+config INPUT_TOUCHSCREEN_ILI_9882_MMI_RESUME_BY_DDI
+    bool "Ilitek Touchscreen Driver 9882 MMI Resume by DDI"
+    default n
+    help
+      Say Y here if you want to have resume by DDI support on Ilitek 9882 MMI.
+
+      If unsure, say N.
+
+config INPUT_TOUCHSCREEN_ILI_9882_MMI_FW_PANEL
+    bool "Ilitek Touchscreen Driver 9882 MMI FW panel"
+    default n
+    help
+      Say Y here if you want to have FW panel support on Ilitek 9882 MMI.
+
+      If unsure, say N.
+
+config INPUT_TOUCHSCREEN_ILI_9882_MMI_SUSPEND_PWROFF
+    bool "Ilitek Touchscreen Driver 9882 MMI Suspend power-off"
+    default n
+    help
+      Say Y here if you want to have suspend power-off support on Ilitek 9882 MMI.
+
+      If unsure, say N.
+
+config INPUT_TOUCHSCREEN_ILI_9882_MMI_CHARGER
+    bool "Ilitek Touchscreen Driver 9882 MMI Charger"
+    default n
+    help
+      Say Y here if you want to have charger support on Ilitek 9882 MMI.
+
+      If unsure, say N.
+
+config INPUT_TOUCHSCREEN_ILI_9882_MMI_ESD
+    bool "Ilitek Touchscreen Driver 9882 MMI ESD"
+    default n
+    help
+      Say Y here if you want to have ESD support on Ilitek 9882 MMI.
+
+      If unsure, say N.
+
+config INPUT_TOUCHSCREEN_ILI_9882_MMI_PEN_NOTIFIER
+    bool "Ilitek Touchscreen Driver 9882 MMI Pen notifier"
+    default n
+    help
+      Say Y here if you want to have pen notifier support on Ilitek 9882 MMI.
+
+      If unsure, say N.
+
+config INPUT_TOUCHSCREEN_ILI_9882_MMI_GESTURE
+    bool "Ilitek Touchscreen Driver 9882 MMI Gesture"
+    default n
+    help
+      Say Y here if you want to have gesture support on Ilitek 9882 MMI.
+
+      If unsure, say N.
+
+config INPUT_TOUCHSCREEN_ILI_9882_MMI_PANEL_GESTURE
+    bool "Ilitek Touchscreen Driver 9882 MMI Panel gesture"
+    default n
+    help
+      Say Y here if you want to have panel gesture support on Ilitek 9882 MMI.
+
+      If unsure, say N.
+
+config INPUT_TOUCHSCREEN_ILI_9882_MMI_PASSIVE_PEN
+    bool "Ilitek Touchscreen Driver 9882 MMI Passive pen"
+    default n
+    help
+      Say Y here if you want to have passive pen support on Ilitek 9882 MMI.
+
+      If unsure, say N.
+
+config INPUT_TOUCHSCREEN_ILI_9882_MMI_LAST_TIME
+    bool "Ilitek Touchscreen Driver 9882 MMI Timestamp"
+    default n
+    help
+      Say Y here if you want to have timestamp support on Ilitek 9882 MMI.
+
+      If unsure, say N.
+
+endif
diff --git a/drivers/leds/trigger/Kbuild b/drivers/leds/trigger/Kbuild
deleted file mode 100644
index 1983f4f1e905..000000000000
--- a/drivers/leds/trigger/Kbuild
+++ /dev/null
@@ -1,5 +0,0 @@
-EXTRA_CFLAGS += -Wall
-EXTRA_CFLAGS += -I$(TOP)/motorola/kernel/modules/include
-
-
-obj-m += ledtrig-sol.o
diff --git a/drivers/leds/trigger/Kconfig b/drivers/leds/trigger/Kconfig
index 4018af769969..7b54c22e05c3 100644
--- a/drivers/leds/trigger/Kconfig
+++ b/drivers/leds/trigger/Kconfig
@@ -129,4 +129,11 @@ config LEDS_TRIGGER_NETDEV
 	  This allows LEDs to be controlled by network device activity.
 	  If unsure, say Y.
 
+config LEDS_TRIGGER_SOL
+	tristate "LED Sign-of-life Trigger"
+	depends on NET
+	help
+	  This allows LEDs to be controlled by battery status.
+	  If unsure, say Y.
+
 endif # LEDS_TRIGGERS
diff --git a/drivers/leds/trigger/Makefile b/drivers/leds/trigger/Makefile
index f3cfe1950538..c399c226e404 100644
--- a/drivers/leds/trigger/Makefile
+++ b/drivers/leds/trigger/Makefile
@@ -13,3 +13,4 @@ obj-$(CONFIG_LEDS_TRIGGER_TRANSIENT)	+= ledtrig-transient.o
 obj-$(CONFIG_LEDS_TRIGGER_CAMERA)	+= ledtrig-camera.o
 obj-$(CONFIG_LEDS_TRIGGER_PANIC)	+= ledtrig-panic.o
 obj-$(CONFIG_LEDS_TRIGGER_NETDEV)	+= ledtrig-netdev.o
+obj-$(CONFIG_LEDS_TRIGGER_SOL)		+= ledtrig-sol.o
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index 700634e099f2..5aadb7a98cb1 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -653,6 +653,7 @@ source "drivers/misc/sx933x/Kconfig"
 source "drivers/misc/sx937x/Kconfig"
 source "drivers/misc/utag/Kconfig"
 source "drivers/misc/aw9610x/Kconfig"
+source "drivers/misc/ldo_vibrator_mmi/Kconfig"
 source "drivers/misc/regulator_vibrator_mmi/Kconfig"
 endmenu
 
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
index f53dce48f55b..d0b5ead82ffe 100644
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@ -85,4 +85,5 @@ obj-$(CONFIG_MOTO_UTAGS) += utag/
 obj-$(CONFIG_SARSENSOR_SX933X) += sx933x/
 obj-$(CONFIG_SARSENSOR_SX937X) += sx937x/
 obj-$(CONFIG_AW9610X_SAR) += aw9610x/
+obj-$(CONFIG_LDO_VIBRATOR_MMI) += ldo_vibrator_mmi/
 obj-$(CONFIG_REGULATOR_VIBRATOR_MMI) += regulator_vibrator_mmi/
diff --git a/drivers/misc/ldo_vibrator_mmi/Kbuild b/drivers/misc/ldo_vibrator_mmi/Kbuild
index ef98f416cd93..b5e54bddb6aa 100644
--- a/drivers/misc/ldo_vibrator_mmi/Kbuild
+++ b/drivers/misc/ldo_vibrator_mmi/Kbuild
@@ -1,12 +1,3 @@
-# add -Wall to try to catch everything we can.
-EXTRA_CFLAGS += -Wall
-EXTRA_CFLAGS += -I$(ANDROID_BUILD_TOP)/motorola/kernel/modules/include
-
-ifneq ($(filter m y,$(CONFIG_VIBRATOR_NOISE_CAMERA)),)
-	EXTRA_CFLAGS += -DCONFIG_VIBRATOR_NOISE_CAMERA
-endif
-
 ldo_vibrator_mmi-y += moto_ldo_vibrator.o
 
-obj-m += ldo_vibrator_mmi.o
-
+obj-$(CONFIG_LDO_VIBRATOR_MMI) += ldo_vibrator_mmi.o
diff --git a/drivers/misc/ldo_vibrator_mmi/Kconfig b/drivers/misc/ldo_vibrator_mmi/Kconfig
new file mode 100644
index 000000000000..e21d18c80a40
--- /dev/null
+++ b/drivers/misc/ldo_vibrator_mmi/Kconfig
@@ -0,0 +1,10 @@
+config LDO_VIBRATOR_MMI
+    tristate "EXT Vibrator-LDO driver"
+    help
+        Say Y here if you have EXT Vibrator-LDO Device in
+        your system.
+
+        If unsure, say N.
+
+        To compile this driver as a module, choose M here: the
+        module will be called ldo_vibrator_mmi.
diff --git a/drivers/misc/regulator_vibrator_mmi/Kbuild b/drivers/misc/regulator_vibrator_mmi/Kbuild
index 08b5e1aa606c..b08c83cbc2b8 100644
--- a/drivers/misc/regulator_vibrator_mmi/Kbuild
+++ b/drivers/misc/regulator_vibrator_mmi/Kbuild
@@ -1,5 +1,3 @@
-ccflags-$(CONFIG_VIBRATOR_NOISE_CAMERA) += -DCONFIG_VIBRATOR_NOISE_CAMERA
-
 regulator_vibrator_mmi-y += moto_regulator_vibrator.o
 
 obj-$(CONFIG_REGULATOR_VIBRATOR_MMI) += regulator_vibrator_mmi.o
diff --git a/drivers/misc/regulator_vibrator_mmi/Kconfig b/drivers/misc/regulator_vibrator_mmi/Kconfig
index 24797b622da0..6e9e90ced8cf 100644
--- a/drivers/misc/regulator_vibrator_mmi/Kconfig
+++ b/drivers/misc/regulator_vibrator_mmi/Kconfig
@@ -1,7 +1,7 @@
 config REGULATOR_VIBRATOR_MMI
-    tristate "EXT Vibrator-LDO driver"
+    tristate "EXT Vibrator-Regulator driver"
     help
-        Say Y here if you have EXT Vibrator-LDO Device in
+        Say Y here if you have EXT Vibrator-Regulator Device in
         your system.
 
         If unsure, say N.
@@ -11,6 +11,6 @@ config REGULATOR_VIBRATOR_MMI
 
 config VIBRATOR_NOISE_CAMERA
     bool "Enable Vibrator Noise Camera"
-    depends on REGULATOR_VIBRATOR_MMI
+    depends on REGULATOR_VIBRATOR_MMI || REGULATOR_LDO_MMI
     help
         Enable Vibrator Noise Camera.
diff --git a/drivers/nfc/st21nfc/Kbuild b/drivers/nfc/st21nfc/Kbuild
index 76794fa10ece..3727fbeb0752 100644
--- a/drivers/nfc/st21nfc/Kbuild
+++ b/drivers/nfc/st21nfc/Kbuild
@@ -1,7 +1 @@
-# add -Wall to try to catch everything we can.
-EXTRA_CFLAGS += -Wall
-EXTRA_CFLAGS += -I$(ANDROID_BUILD_TOP)/motorola/kernel/modules/include
-
-obj-m += st21nfc.o
-
-KBUILD_EXTRA_SYMBOLS += $(CURDIR)/$(KBUILD_EXTMOD)/../../mmi_info/Module.symvers
+obj-$(CONFIG_NFC_ST21NFC) += st21nfc.o
diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
index 491ad37eb435..882b79c7317a 100644
--- a/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@ -7,9 +7,13 @@ source "drivers/power/qpnp-smbcharger-mmi/Kconfig"
 source "drivers/power/mmi_parallel_charger/Kconfig"
 source "drivers/power/mmi_parallel_charger_qc3p/Kconfig"
 source "drivers/power/bq2597x_mmi/Kconfig"
+source "drivers/power/bq2597x_mmi_iio/Kconfig"
 source "drivers/power/sgm4154x_chg_mmi/Kconfig"
 source "drivers/power/bq2589x_chg_mmi/Kconfig"
 source "drivers/power/mmi_charger/Kconfig"
 source "drivers/power/mmi_discrete_charger/Kconfig"
+source "drivers/power/mmi_discrete_turbo_charger/Kconfig"
+source "drivers/power/mmi_qc3p_wt6670f/Kconfig"
 source "drivers/power/cw2217b_fg_mmi/Kconfig"
 source "drivers/power/sm5602_fg_mmi/Kconfig"
+source "drivers/power/rt9471_chg_mmi/Kconfig"
diff --git a/drivers/power/Makefile b/drivers/power/Makefile
index 2ee26bbcd1c2..bf1d728f0be9 100644
--- a/drivers/power/Makefile
+++ b/drivers/power/Makefile
@@ -8,9 +8,13 @@ obj-$(CONFIG_QPNP_SMBCHARGER_MMI) += qpnp-smbcharger-mmi/
 obj-$(CONFIG_MMI_PARALLEL_CHARGER) += mmi_parallel_charger/
 obj-$(CONFIG_MMI_PARALLEL_CHARGER_QC3P) += mmi_parallel_charger_qc3p/
 obj-$(CONFIG_BQ2597X_MMI) += bq2597x_mmi/
+obj-$(CONFIG_BQ2597X_MMI_IIO) += bq2597x_mmi_iio/
 obj-$(CONFIG_BQ2589X_CHARGER) += bq2589x_chg_mmi/
 obj-$(CONFIG_MMI_CHARGER) += mmi_charger/
 obj-$(CONFIG_MMI_DISCRETE_CHARGER) += mmi_discrete_charger/
+obj-$(CONFIG_MMI_DISCRETE_TURBO_CHARGER) += mmi_discrete_turbo_charger/
+obj-$(CONFIG_MMI_QC3P_WT6670F) += mmi_qc3p_wt6670f/
 obj-$(CONFIG_SGM4154X_CHARGER) += sgm4154x_chg_mmi/
 obj-$(CONFIG_CW2217B_FG_MMI) += cw2217b_fg_mmi/
 obj-$(CONFIG_SM5602_FQ_MMI) += sm5602_fg_mmi/
+obj-$(CONFIG_RT9471_CHG_MMI) += rt9471_chg_mmi/
diff --git a/drivers/power/bq2589x_chg_mmi/Kbuild b/drivers/power/bq2589x_chg_mmi/Kbuild
index 7d9c98796cb3..e0e0802affc1 100644
--- a/drivers/power/bq2589x_chg_mmi/Kbuild
+++ b/drivers/power/bq2589x_chg_mmi/Kbuild
@@ -1,4 +1 @@
-ccflags-$(CONFIG_BQ2589X_MMI_QC3P_TURBO_CHARGER) += -DCONFIG_MMI_QC3P_TURBO_CHARGER
-ccflags-$(CONFIG_BQ2589X_MMI_QC3P_WT6670_DETECTED) += -DCONFIG_MMI_QC3P_WT6670_DETECTED
-
 obj-$(CONFIG_BQ2589X_CHARGER) += bq2589x_charger.o
diff --git a/drivers/power/bq2589x_chg_mmi/Kconfig b/drivers/power/bq2589x_chg_mmi/Kconfig
index 0a125ab8a473..96f25de40d2c 100644
--- a/drivers/power/bq2589x_chg_mmi/Kconfig
+++ b/drivers/power/bq2589x_chg_mmi/Kconfig
@@ -22,15 +22,6 @@ config BQ2589X_MMI_QC3P_TURBO_CHARGER
 
         If unsure, say N.
 
-config BQ2589X_MMI_QC3P_WT6670_DETECTED
-    bool "Enable BQ2589X Moto QC3P WT6670"
-    depends on BQ2589X_CHARGER
-    default n
-    help
-        Say Y here if you have a BQ2589X Moto QC3P WT6670 compatible device connected.
-
-        If unsure, say N.
-
 config MMI_EXT_CHG_LED
     bool "Enable MMI external charger LED"
     default n
diff --git a/drivers/power/bq2597x_mmi_iio/Kbuild b/drivers/power/bq2597x_mmi_iio/Kbuild
index 4a5406b5538b..eaab1e1ea98c 100644
--- a/drivers/power/bq2597x_mmi_iio/Kbuild
+++ b/drivers/power/bq2597x_mmi_iio/Kbuild
@@ -1,7 +1 @@
-# 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/power/bq2597x_mmi_iio
-
-obj-m += bq2597x_mmi_iio.o
-
+obj-$(CONFIG_BQ2597X_MMI_IIO) += bq2597x_mmi_iio.o
diff --git a/drivers/power/bq2597x_mmi_iio/Kconfig b/drivers/power/bq2597x_mmi_iio/Kconfig
new file mode 100644
index 000000000000..f27a0b63702d
--- /dev/null
+++ b/drivers/power/bq2597x_mmi_iio/Kconfig
@@ -0,0 +1,9 @@
+config BQ2597X_MMI_IIO
+	tristate "BQ2597X MMI IIO"
+	default n
+	help
+	  Say Y here if you have a bq2597x iio compatible
+	  device connected.
+
+	  This driver can also be built as a module.  If so, the module
+	  will be called bq2597x_mmi_iio.
diff --git a/drivers/power/mmi_discrete_turbo_charger/Kbuild b/drivers/power/mmi_discrete_turbo_charger/Kbuild
index b6d3765de57c..415f13d845d3 100644
--- a/drivers/power/mmi_discrete_turbo_charger/Kbuild
+++ b/drivers/power/mmi_discrete_turbo_charger/Kbuild
@@ -1,13 +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/power/mmi_discrete_turbo_charger
-
-ifneq ($(filter m y,$(CONFIG_MMI_QC3P_WT6670_DETECTED)),)
-        EXTRA_CFLAGS += -DCONFIG_MMI_QC3P_WT6670_DETECTED
-endif
-
-obj-m += mmi_discrete_turbo_charger.o
+obj-$(CONFIG_MMI_DISCRETE_TURBO_CHARGER) += mmi_discrete_turbo_charger.o
 mmi_discrete_turbo_charger-objs += mmi_charger_class.o
 mmi_discrete_turbo_charger-objs += mmi_charger_core.o
 mmi_discrete_turbo_charger-objs += mmi_charger_pump_policy.o
@@ -15,8 +6,3 @@ mmi_discrete_turbo_charger-objs += mmi_cp_charger.o
 mmi_discrete_turbo_charger-objs += qpnp_pmic_charger.o
 mmi_discrete_turbo_charger-objs += mmi_qc3p.o
 mmi_discrete_turbo_charger-objs += mmi_qc3p_cp_policy.o
-
-#ifeq ($(CONFIG_MMI_PL_CP_POLICY), y)
-#endif
-
-KBUILD_EXTRA_SYMBOLS += $(CURDIR)/$(KBUILD_EXTMOD)/../../usb/typec/adapter_class/$(GKI_OBJ_MODULE_DIR)/Module.symvers
diff --git a/drivers/power/mmi_discrete_turbo_charger/Kconfig b/drivers/power/mmi_discrete_turbo_charger/Kconfig
new file mode 100644
index 000000000000..2e7ff4513f6c
--- /dev/null
+++ b/drivers/power/mmi_discrete_turbo_charger/Kconfig
@@ -0,0 +1,12 @@
+config MMI_DISCRETE_TURBO_CHARGER
+    tristate "MMI Discrete Turbo Charger Driver"
+    depends on ADAPTER_CLASS && MMI_CHARGER
+    default n
+    help
+        Say Y here if you have mmi discrete turbo charger support
+        in your system.
+
+        If unsure, say N.
+
+        To compile this driver as a module, choose M here: the
+        module will be called mmi_discrete_turbo_charger.
diff --git a/drivers/power/mmi_qc3p_wt6670f/Kbuild b/drivers/power/mmi_qc3p_wt6670f/Kbuild
index 3aa60e03232d..d1666f7e257b 100644
--- a/drivers/power/mmi_qc3p_wt6670f/Kbuild
+++ b/drivers/power/mmi_qc3p_wt6670f/Kbuild
@@ -1,9 +1,2 @@
-# add -Wall to try to catch everything we can.
-EXTRA_CFLAGS += -Wall
-EXTRA_CFLAGS += -I$(ANDROID_BUILD_TOP)/motorola/kernel/modules/include
-EXTRA_CFLAGS += -I$(ANDROID_BUILD_TOP)/motorola/kernel/drivers/power/mmi_qc3p_wt6670f
-ifneq ($(filter m y,$(CONFIG_MMI_QC3P_TURBO_CHARGER_ISP_5G)),)
-    EXTRA_CFLAGS += -DCONFIG_MMI_QC3P_TURBO_CHARGER_ISP_5G
-endif
 mmi_qc3p_wt6670f-objs += wt6670f_qc3p.o wt6670f_upgrade.o
-obj-m += mmi_qc3p_wt6670f.o
+obj-$(CONFIG_MMI_QC3P_WT6670F) += mmi_qc3p_wt6670f.o
diff --git a/drivers/power/mmi_qc3p_wt6670f/Kconfig b/drivers/power/mmi_qc3p_wt6670f/Kconfig
new file mode 100644
index 000000000000..ec8dad92d3f9
--- /dev/null
+++ b/drivers/power/mmi_qc3p_wt6670f/Kconfig
@@ -0,0 +1,46 @@
+config MMI_QC3P_WT6670F
+    tristate "MMI QC3P WT6670F Driver"
+    depends on ADAPTER_CLASS && MMI_CHARGER
+    default n
+    help
+        Say Y here if you have mmi qc3p wt6670f support
+        in your system.
+
+        If unsure, say N.
+
+        To compile this driver as a module, choose M here: the
+        module will be called mmi_qc3p_wt6670f.
+
+config MMI_QC3P_WT6670_DETECTED
+    bool "Enable MMI QC3P WT6670 detection"
+    depends on MMI_QC3P_WT6670F
+    default n
+    help
+        Say Y here to enable mmi QC3P WT6670 detection.
+
+        If unsure, say N.
+
+config MMI_QC3P_Z350_DETECTED
+    bool "Enable MMI QC3P Z350 detection"
+    depends on MMI_QC3P_WT6670F
+    default n
+    help
+        Say Y here to enable mmi QC3P Z350 detection.
+
+        If unsure, say N.
+
+config MMI_QC3P_TURBO_CHARGER
+    bool "Enable MMI QC3P Turbo Charger"
+    default n
+    help
+        Say Y here to enable mmi QC3P Turbo Charger.
+
+        If unsure, say N.
+
+config MMI_QC3P_TURBO_CHARGER_ISP_5G
+    bool "Enable MMI QC3P Turbo Charger ISP 5G"
+    default n
+    help
+        Say Y here to enable mmi QC3P Turbo Charger ISP 5G.
+
+        If unsure, say N.
diff --git a/drivers/power/rt9471_chg_mmi/Kbuild b/drivers/power/rt9471_chg_mmi/Kbuild
index dbe3b256ecd7..9d9019cd19db 100644
--- a/drivers/power/rt9471_chg_mmi/Kbuild
+++ b/drivers/power/rt9471_chg_mmi/Kbuild
@@ -1,16 +1 @@
-# 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/power/rt9471_chg_mmi
-
-ifneq ($(filter m y,$(CONFIG_MMI_QC3P_TURBO_CHARGER)),)
-        EXTRA_CFLAGS += -DCONFIG_MMI_QC3P_TURBO_CHARGER
-endif
-
-ifneq ($(filter m y,$(CONFIG_MMI_QC3P_WT6670_DETECTED)),)
-        EXTRA_CFLAGS += -DCONFIG_MMI_QC3P_WT6670_DETECTED
-endif
-
-obj-m += rt9471_charger.o
-
-KBUILD_EXTRA_SYMBOLS += $(CURDIR)/$(KBUILD_EXTMOD)/../mmi_discrete_charger/$(GKI_OBJ_MODULE_DIR)/Module.symvers
+obj-$(CONFIG_RT9471_CHG_MMI) += rt9471_charger.o
diff --git a/drivers/power/rt9471_chg_mmi/Kconfig b/drivers/power/rt9471_chg_mmi/Kconfig
new file mode 100644
index 000000000000..241854adc543
--- /dev/null
+++ b/drivers/power/rt9471_chg_mmi/Kconfig
@@ -0,0 +1,12 @@
+config RT9471_CHG_MMI
+    tristate "MMI RT9471 Charger Driver"
+    depends on ADAPTER_CLASS && MMI_CHARGER
+    default n
+    help
+        Say Y here if you have mmi rt9471 support
+        in your system.
+
+        If unsure, say N.
+
+        To compile this driver as a module, choose M here: the
+        module will be called rt9471_charger.
diff --git a/drivers/power/sgm4154x_chg_mmi/Kbuild b/drivers/power/sgm4154x_chg_mmi/Kbuild
index 6c7470360f5b..8ffa9791728b 100644
--- a/drivers/power/sgm4154x_chg_mmi/Kbuild
+++ b/drivers/power/sgm4154x_chg_mmi/Kbuild
@@ -1,5 +1 @@
-ccflags-$(CONFIG_SGM4154X_MMI_QC3P_TURBO_CHARGER) += -DCONFIG_MMI_QC3P_TURBO_CHARGER
-ccflags-$(CONFIG_SGM4154X_MMI_QC3P_WT6670_DETECTED) += -DCONFIG_MMI_QC3P_WT6670_DETECTED
-ccflags-$(CONFIG_SGM4154X_MMI_SGM41513_CHARGER) += -DCONFIG_MMI_SGM41513_CHARGER
-
 obj-$(CONFIG_SGM4154X_CHARGER) += sgm4154x_charger.o
diff --git a/drivers/power/sgm4154x_chg_mmi/Kconfig b/drivers/power/sgm4154x_chg_mmi/Kconfig
index bb24dd9769a6..c34882898d96 100644
--- a/drivers/power/sgm4154x_chg_mmi/Kconfig
+++ b/drivers/power/sgm4154x_chg_mmi/Kconfig
@@ -13,25 +13,7 @@ config SGM4154X_CHARGER
         To compile this driver as a module, choose M here: the
         module will be called sgm415x_charger.
 
-config SGM4154X_MMI_QC3P_TURBO_CHARGER
-    bool "Enable SGM4154X Moto QC3P Turbo Charger"
-    depends on SGM4154X_CHARGER
-    default n
-    help
-        Say Y here if you have a SGM4154X Moto QC3P turbo charger compatible device connected.
-
-        If unsure, say N.
-
-config SGM4154X_MMI_QC3P_WT6670_DETECTED
-    bool "Enable SGM4154X Moto QC3P WT6670"
-    depends on SGM4154X_CHARGER
-    default n
-    help
-        Say Y here if you have a SGM4154X Moto QC3P WT6670 compatible device connected.
-
-        If unsure, say N.
-
-config SGM4154X_MMI_SGM41513_CHARGER
+config MMI_SGM41513_CHARGER
     bool "Enable SGM4154X Moto SGM41513 Charger"
     depends on SGM4154X_CHARGER
     default n