diff --git a/tuna-kiwi-bt.dts b/tuna-kiwi-bt.dts
index ce66fdb0..91d22d95 100644
--- a/tuna-kiwi-bt.dts
+++ b/tuna-kiwi-bt.dts
@@ -15,5 +15,5 @@
 				 "qcom,tuna-atp", "qcom,tunap-atp", "qcom,atp",
 				 "qcom,tuna", "qcom,tunap";
 	qcom,msm-id = <681 0x10000>, <655 0x10000>;
-	qcom,board-id = <21 1>, <8 2>, <33 0>;
-};
\ No newline at end of file
+	qcom,board-id = <21 1>, <8 2>, <8 3>;
+};
diff --git a/tuna-kiwi-bt.dtsi b/tuna-kiwi-bt.dtsi
index a323f7c4..71d43ed9 100644
--- a/tuna-kiwi-bt.dtsi
+++ b/tuna-kiwi-bt.dtsi
@@ -17,14 +17,6 @@
 		bias-disable;
 		power-source = <1>;
 	};
-	bt_fmd_clk_en: bt_fmd_clk_en {
-		pins = "gpio3";
-		function = "normal";
-		input-enable;
-		output-disable;
-		bias-disable;
-		power-source = <1>;
-	};
 };
 
 &tlmm {
@@ -40,23 +32,18 @@
 	bluetooth: bt_kiwi {
 		compatible = "qcom,kiwi";
 
-		nvmem-cells = <&fmd_set>, <&fmd_chg_pon>, <&fmd_cnt2_stop>;
-		nvmem-cell-names = "fmd_set", "fmd_chg_pon", "fmd_cnt2_stop";
-
 		clock-names = "bt_rf_clk1";
 		clocks = <&rpmhcc RPMH_RF_CLK1>;
 
 		pinctrl-0 = <&bt_en>;
 		pinctrl-1 = <&cnss_bt_sw_ctrl>;
-		pinctrl-2 = <&bt_fmd_clk_en>;
-		pinctrl-names = "bt_en", "sw_ctrl", "bt_fmd_clk_en";
+		pinctrl-names = "bt_en", "sw_ctrl";
 
 		/* List of GPIOs to be setup for interrupt wakeup capable*/
 		mpm_wake_set_gpios = <80>;
 		qcom,wl-reset-gpio = <&tlmm 35 0>; /* WL_EN */
 		qcom,bt-sw-ctrl-gpio = <&tlmm 80 0>; /* SW_CTRL */
 
-		qcom,bt-fmd-clk-gpio = <&pm8550vs_g_gpios 3 0>; /* FMD_CLK_EN */
 		qcom,bt-reset-gpio   = <&pm8550vs_g_gpios 4 0>; /* WCN_BT_EN */
 
 		qcom,qmp = <&aoss_qmp>;
diff --git a/tuna-wcn7750-bt.dts b/tuna-wcn7750-bt.dts
index 2f82cd49..be2aaea8 100644
--- a/tuna-wcn7750-bt.dts
+++ b/tuna-wcn7750-bt.dts
@@ -16,5 +16,5 @@
 				 "qcom,tuna-qrd", "qcom,tunap-qrd", "qcom,qrd",
 				 "qcom,tuna", "qcom,tunap";
 	qcom,msm-id = <681 0x10000>, <655 0x10000>;
-	qcom,board-id = <8 0>, <8 1>, <1 0>, <11 0>, <21 0>, <33 0>;
-};
\ No newline at end of file
+	qcom,board-id = <1 0>, <8 0>, <8 1>, <8 4>, <11 0>, <21 0>, <33 0>;
+};