diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
index 1ed222147cd7..14891d4efbd5 100644
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@ -905,5 +905,6 @@ config LEDS_INDICATOR_PWM
 
 comment "LED Triggers"
 source "drivers/leds/trigger/Kconfig"
+source "drivers/leds/aw2033/Kconfig"
 
 endif # NEW_LEDS
diff --git a/drivers/leds/Makefile b/drivers/leds/Makefile
index fe4892d4ef49..ac193edd8765 100644
--- a/drivers/leds/Makefile
+++ b/drivers/leds/Makefile
@@ -93,6 +93,7 @@ obj-$(CONFIG_LEDS_QTI_TRI_LED)		+= leds-qti-tri-led.o
 obj-$(CONFIG_LEDS_QPNP_FLASH_V2)        += leds-qpnp-flash-v2.o
 obj-$(CONFIG_LEDS_QPNP_VIBRATOR_LDO)	+= leds-qpnp-vibrator-ldo.o
 obj-$(CONFIG_LEDS_INDICATOR_PWM)	+= leds-indicator-pwm.o
+obj-$(CONFIG_LEDS_AW2033)		+= aw2033/
 
 # LED SPI Drivers
 obj-$(CONFIG_LEDS_CR0014114)		+= leds-cr0014114.o
diff --git a/drivers/leds/aw2033/Kbuild b/drivers/leds/aw2033/Kbuild
old mode 100755
new mode 100644
index 5091ce3fb4ae..0240825e5b66
--- a/drivers/leds/aw2033/Kbuild
+++ b/drivers/leds/aw2033/Kbuild
@@ -1,6 +1 @@
-# add -Wall to try to catch everything we can.
-EXTRA_CFLAGS += -Wall
-EXTRA_CFLAGS += -I$(TOP)/motorola/kernel/modules/include
-
-
-obj-m += leds_aw2033.o
+obj-$(CONFIG_LEDS_AW2033) += leds_aw2033.o
diff --git a/drivers/leds/aw2033/Kconfig b/drivers/leds/aw2033/Kconfig
new file mode 100644
index 000000000000..855de6828d66
--- /dev/null
+++ b/drivers/leds/aw2033/Kconfig
@@ -0,0 +1,5 @@
+config LEDS_AW2033
+	tristate "Awinic AW2033 LED support"
+	help
+	  Support for Awinic AW2033 LED controller
+	  If unsure, say N
diff --git a/drivers/misc/awinic/Kconfig b/drivers/misc/awinic/Kconfig
index c9fbf1c5adfa..dd70964076c1 100644
--- a/drivers/misc/awinic/Kconfig
+++ b/drivers/misc/awinic/Kconfig
@@ -1 +1,2 @@
+source "drivers/misc/awinic/aw862x/Kconfig"
 source "drivers/misc/awinic/sarsensor/Kconfig"
diff --git a/drivers/misc/awinic/Makefile b/drivers/misc/awinic/Makefile
index 40a207b68ba8..1ba4f93c3a5a 100644
--- a/drivers/misc/awinic/Makefile
+++ b/drivers/misc/awinic/Makefile
@@ -1 +1,2 @@
+obj-$(CONFIG_AW862X_HAPTIC) += aw862x/
 obj-$(CONFIG_AW96XX_SAR) += sarsensor/
diff --git a/drivers/misc/awinic/aw862x/Kconfig b/drivers/misc/awinic/aw862x/Kconfig
new file mode 100644
index 000000000000..22939b6b1cc3
--- /dev/null
+++ b/drivers/misc/awinic/aw862x/Kconfig
@@ -0,0 +1,15 @@
+#
+# AW862X Driver
+#
+
+config AW862X_HAPTIC
+	tristate "Awinic AW862X haptic driver"
+	depends on I2C
+	help
+	  Say Y here if you have Awinic AW862X haptic controller
+	  chip in your system.
+
+	  If unsure, say N.
+
+	  To compile this driver as a module, choose M here: the
+	  module will be called aw862x.
diff --git a/drivers/nfc/Kconfig b/drivers/nfc/Kconfig
index 7187d0e131ac..ec532c676c75 100644
--- a/drivers/nfc/Kconfig
+++ b/drivers/nfc/Kconfig
@@ -63,6 +63,8 @@ source "drivers/nfc/samsung/Kconfig"
 source "drivers/nfc/sn2xx/Kconfig"
 endmenu
 
+source "drivers/nfc/sn1xx/Kconfig"
+
 config NFC_QTI_I2C
 	tristate "QTI NCI based NFC I2C Slave Driver for SNxxx"
 	depends on I2C
diff --git a/drivers/nfc/Makefile b/drivers/nfc/Makefile
index 775cf0d48325..f682b10e2a7d 100644
--- a/drivers/nfc/Makefile
+++ b/drivers/nfc/Makefile
@@ -18,5 +18,6 @@ obj-$(CONFIG_NFC_NXP_NCI)	+= nxp-nci/
 obj-$(CONFIG_NFC_S3FWRN5)	+= s3fwrn5/
 obj-$(CONFIG_NFC_ST95HF)	+= st95hf/
 obj-$(CONFIG_SEC_NFC)           += samsung/
+obj-$(CONFIG_NFC_SN1XX)         += sn1xx/
 obj-$(CONFIG_NFC_SN2XX)         += sn2xx/
 obj-y				+= qti/
diff --git a/drivers/nfc/sn1xx/Kbuild b/drivers/nfc/sn1xx/Kbuild
index 5426c69d2b16..065f9ef89b18 100644
--- a/drivers/nfc/sn1xx/Kbuild
+++ b/drivers/nfc/sn1xx/Kbuild
@@ -1,8 +1,3 @@
-# add -Wall to try to catch everything we can.
-EXTRA_CFLAGS += -Wall
-EXTRA_CFLAGS += -I$(ANDROID_BUILD_TOP)/motorola/kernel/modules/include
-
-obj-m        += nfc_i2c.o
 nfc_i2c-objs:= nfc_common.o nfc_i2c_drv.o
 
-KBUILD_EXTRA_SYMBOLS += $(CURDIR)/$(KBUILD_EXTMOD)/../../mmi_info/Module.symvers
+obj-$(CONFIG_NFC_SN1XX) += nfc_i2c.o
diff --git a/drivers/nfc/sn1xx/Kconfig b/drivers/nfc/sn1xx/Kconfig
new file mode 100644
index 000000000000..8cc82548e515
--- /dev/null
+++ b/drivers/nfc/sn1xx/Kconfig
@@ -0,0 +1,6 @@
+config NFC_SN1XX
+	tristate "QTI NFC for SN1xx"
+	help
+	  This enables the QTI NFC driver for SN1xx based devices.
+
+	  If unsure, say N.
diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
index 85a55b158843..b0075319737e 100644
--- a/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@ -34,12 +34,14 @@ config MMI_EXT_CHG_LED
 source "drivers/power/bq2589x_chg_mmi/Kconfig"
 source "drivers/power/bq2597x_mmi_iio/Kconfig"
 source "drivers/power/bq25980_mmi_iio/Kconfig"
+source "drivers/power/cps4019_wls_charger/Kconfig"
 source "drivers/power/cw2217b_fg_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_parallel_charger_iio/Kconfig"
 source "drivers/power/mmi-smbcharger-iio/Kconfig"
+source "drivers/power/mm8013c_fg_mmi/Kconfig"
 source "drivers/power/qpnp_adaptive_charge/Kconfig"
 source "drivers/power/sgm4154x_chg_mmi/Kconfig"
 source "drivers/power/sm5602_fg_mmi/Kconfig"
diff --git a/drivers/power/Makefile b/drivers/power/Makefile
index f828f436d54c..ec819cf66104 100644
--- a/drivers/power/Makefile
+++ b/drivers/power/Makefile
@@ -6,12 +6,14 @@ obj-$(CONFIG_POWER_SUPPLY)	+= supply/
 obj-$(CONFIG_BQ2589X_CHARGER)	+= bq2589x_chg_mmi/
 obj-$(CONFIG_BQ2597X_MMI_IIO)	+= bq2597x_mmi_iio/
 obj-$(CONFIG_BQ25980_MMI_IIO_CHARGER)	+= bq25980_mmi_iio/
+obj-$(CONFIG_CPS_WLS_CHARGER)	+= cps4019_wls_charger/
 obj-$(CONFIG_CW2217B_FG_MMI)	+= cw2217b_fg_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_PARALLEL_CHARGER_IIO)	+= mmi_parallel_charger_iio/
 obj-$(CONFIG_MMI_SMBCHARGER_IIO)	+= mmi-smbcharger-iio/
+obj-$(CONFIG_MMI_MM8013C_FG)	+= mm8013c_fg_mmi/
 obj-$(CONFIG_QPNP_ADAPTIVE_CHARGE)	+= qpnp_adaptive_charge/
 obj-$(CONFIG_SGM4154X_CHARGER)	+= sgm4154x_chg_mmi/
 obj-$(CONFIG_MMI_SM5602_FG)	+= sm5602_fg_mmi/
diff --git a/drivers/power/cps4019_wls_charger/Kbuild b/drivers/power/cps4019_wls_charger/Kbuild
index d427e8a8df92..44c0ec6a4951 100644
--- a/drivers/power/cps4019_wls_charger/Kbuild
+++ b/drivers/power/cps4019_wls_charger/Kbuild
@@ -1,8 +1 @@
-# 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/cps4019_wls_charger
-
-obj-m += cps4019_wls_charger.o
-
-KBUILD_EXTRA_SYMBOLS += $(CURDIR)/$(KBUILD_EXTMOD)/../mmi_discrete_charger/$(GKI_OBJ_MODULE_DIR)/Module.symvers
+obj-$(CONFIG_CPS_WLS_CHARGER) += cps4019_wls_charger.o
diff --git a/drivers/power/cps4019_wls_charger/Kconfig b/drivers/power/cps4019_wls_charger/Kconfig
index 070c1603c865..5463ef8b8091 100644
--- a/drivers/power/cps4019_wls_charger/Kconfig
+++ b/drivers/power/cps4019_wls_charger/Kconfig
@@ -1,10 +1,6 @@
-menu "Qualcomm Technologies Inc Charger and Fuel Gauge support"
-
 config CPS_WLS_CHARGER
-        bool "CPS wireless charger driver"
-        depends on POWER_SUPPLY
-        depends on I2C
-        help
-          Say Y to enable support for CPS wireless charger.
-
-endmenu
+	tristate "CPS wireless charger driver"
+	depends on POWER_SUPPLY
+	depends on I2C
+	help
+	  Say Y to enable support for CPS wireless charger.
diff --git a/drivers/power/mm8013c_fg_mmi/Kbuild b/drivers/power/mm8013c_fg_mmi/Kbuild
index 66ea64620b81..bdff1100fec0 100644
--- a/drivers/power/mm8013c_fg_mmi/Kbuild
+++ b/drivers/power/mm8013c_fg_mmi/Kbuild
@@ -1,7 +1,3 @@
-# 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/mm8013c_fg_mmi
-
 mm8013c_fg_mmi-objs += mm8013c_battery.o
-obj-m += mm8013c_fg_mmi.o
+
+obj-$(CONFIG_MMI_MM8013C_FG) += mm8013c_fg_mmi.o
diff --git a/drivers/power/mm8013c_fg_mmi/Kconfig b/drivers/power/mm8013c_fg_mmi/Kconfig
new file mode 100644
index 000000000000..43d69b6dfa69
--- /dev/null
+++ b/drivers/power/mm8013c_fg_mmi/Kconfig
@@ -0,0 +1,9 @@
+config MMI_MM8013C_FG
+	tristate "MMI mm8013c fuel gauge"
+	default n
+	help
+	  Say Y here if you have a mmi mm8013c fg compatible
+	  device connected.
+
+	  This driver can also be built as a module. If so, the module
+	  will be called mmi_mm8013c_fg.