diff --git a/Android.mk b/Android.mk
index e96f13d675..5311caee7d 100644
--- a/Android.mk
+++ b/Android.mk
@@ -6,9 +6,9 @@ LOCAL_PATH := $(call my-dir)
 ifeq ($(call is-board-platform-in-list,taro kalama), true)
 
 BT_SELECT := CONFIG_MSM_BT_POWER=m
-ifdef CONFIG_SLIMBUS
+#ifdef CONFIG_SLIMBUS
 BT_SELECT += CONFIG_BTFM_SLIM=m
-endif
+#endif
 BT_SELECT += CONFIG_I2C_RTC6226_QCA=m
 
 LOCAL_PATH := $(call my-dir)
diff --git a/bt_kernel_vendor_board.mk b/bt_kernel_vendor_board.mk
index d1666d03d6..72c5e5d865 100644
--- a/bt_kernel_vendor_board.mk
+++ b/bt_kernel_vendor_board.mk
@@ -1,10 +1,19 @@
 # Build audio kernel driver
-ifneq ($(TARGET_USES_QMAA),true)
 ifneq ($(TARGET_BOARD_AUTO),true)
-ifeq ($(call is-board-platform-in-list,$(TARGET_BOARD_PLATFORM)),true)
-BOARD_VENDOR_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/btpower.ko\
-	$(KERNEL_MODULES_OUT)/bt_fm_slim.ko \
-	$(KERNEL_MODULES_OUT)/radio-i2c-rtc6226-qca.ko
-endif
+ifeq ($(TARGET_USES_QMAA),true)
+  ifeq ($(TARGET_USES_QMAA_OVERRIDE_BLUETOOTH), true)
+     ifeq ($(call is-board-platform-in-list,$(TARGET_BOARD_PLATFORM)),true)
+         BOARD_VENDOR_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/btpower.ko\
+             $(KERNEL_MODULES_OUT)/bt_fm_slim.ko \
+	     $(KERNEL_MODULES_OUT)/radio-i2c-rtc6226-qca.ko
+     endif
+  endif
+else
+  ifeq ($(call is-board-platform-in-list,$(TARGET_BOARD_PLATFORM)),true)
+     BOARD_VENDOR_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/btpower.ko\
+            $(KERNEL_MODULES_OUT)/bt_fm_slim.ko \
+	    $(KERNEL_MODULES_OUT)/radio-i2c-rtc6226-qca.ko
+
+  endif
 endif
 endif
diff --git a/pwr/btpower.c b/pwr/btpower.c
index 9ab5b3abdf..aed5507ed7 100644
--- a/pwr/btpower.c
+++ b/pwr/btpower.c
@@ -139,16 +139,16 @@ static struct bt_power_vreg_data bt_vregs_info_qca6xx0[] = {
 
 // Regulator structure for kiwi BT SoC series
 static struct bt_power_vreg_data bt_vregs_info_kiwi[] = {
-	{NULL, "qcom,bt-vdd-io",      1800000, 1800000, 0, false, true,
+	{NULL, "qcom,bt-vdd18-aon",      1800000, 1800000, 0, false, true,
 		{BT_VDD_IO_LDO, BT_VDD_IO_LDO_CURRENT}},
 	{NULL, "qcom,bt-vdd-aon",     950000,  950000,  0, false, true,
 		{BT_VDD_AON_LDO, BT_VDD_AON_LDO_CURRENT}},
-	{NULL, "qcom,bt-vdd-rfacmn",  950000,  950000,  0, false, true,
+	{NULL, "qcom,bt-vdd-rfaOp8",  950000,  950000,  0, false, true,
 		{BT_VDD_RFACMN, BT_VDD_RFACMN_CURRENT}},
 	/* BT_CX_MX */
 	{NULL, "qcom,bt-vdd-dig",      950000,  950000,  0, false, true,
 		{BT_VDD_DIG_LDO, BT_VDD_DIG_LDO_CURRENT}},
-	{NULL, "qcom,bt-vdd-rfa-0p8",  950000,  952000,  0, false, true,
+	{NULL, "qcom,bt-vdd-rfaOp8",  950000,  952000,  0, false, true,
 		{BT_VDD_RFA_0p8, BT_VDD_RFA_0p8_CURRENT}},
 	{NULL, "qcom,bt-vdd-rfa1",     1350000, 1350000, 0, false, true,
 		{BT_VDD_RFA1_LDO, BT_VDD_RFA1_LDO_CURRENT}},
diff --git a/slimbus/Kconfig b/slimbus/Kconfig
index a465e3c4ce..e94dc56e18 100644
--- a/slimbus/Kconfig
+++ b/slimbus/Kconfig
@@ -3,7 +3,6 @@
 config BTFM_SLIM
 	tristate "MSM Bluetooth/FM Slimbus Device"
 	depends on MSM_BT_POWER
-	select SLIMBUS
 	help
 		This enables BT/FM slimbus driver to get multiple audio channel.
 		This will make use of slimbus platform driver and slimbus