diff --git a/qcom/bangkk-fps-overlay.dtsi b/qcom/bangkk-fps-overlay.dtsi
index 364d5a440a08..3e82631392f1 100644
--- a/qcom/bangkk-fps-overlay.dtsi
+++ b/qcom/bangkk-fps-overlay.dtsi
@@ -44,12 +44,12 @@
 	ets_vcc_high: ets_vcc_high {
 		/* INTERRUPT */
 		mux {
-			pins = "gpio38";
+			pins = "gpio100";
 			function = "gpio";
 		};
 
 		config {
-			pins = "gpio38";
+			pins = "gpio100";
 			drive-strength = <2>; /* 2 MA */
 			output-high;
 		};
@@ -58,77 +58,28 @@
 	ets_vcc_low: ets_vcc_low {
 		/* INTERRUPT */
 		mux {
-			pins = "gpio38";
+			pins = "gpio100";
 			function = "gpio";
 		};
 
 		config {
-			pins = "gpio38";
+			pins = "gpio100";
 			drive-strength = <2>; /* 2 MA */
 			output-low;
 		};
 	};
 
-	fps_rst_active: fps_rst_active {
-		/* active state */
-		mux {
-			pins = "gpio18";
-			function = "gpio";
-		};
 
-		config {
-			pins = "gpio18";
-			drive-strength = <2>; /* 2 MA */
-			output-low;
-		};
-	};
 
-	fps_rst_suspend: fps_rst_suspend {
-		/* sleep state */
-		mux {
-			pins = "gpio18";
-			function = "gpio";
-		};
 
-		config {
-			pins = "gpio18";
-			drive-strength = <2>; /* 2 MA */
-		};
-	};
 
-	fps_int_active: fps_int_active {
-		/* active state */
-		mux {
-			pins = "gpio17";
-			function = "gpio";
-		};
 
-		config {
-			pins = "gpio17";
-			drive-strength = <2>; /* 2 MA */
-			bias-disable;
-			input-enable;
-		};
-	};
 
-	fps_int_suspend: fps_int_suspend {
-		/* sleep state */
-		mux {
-			pins = "gpio17";
-			function = "gpio";
-		};
 
-		config {
-			pins = "gpio17";
-			drive-strength = <2>; /* 2 MA */
-			bias-disable;
-			input-enable;
-		};
-	};
 };
 
 &soc {
-	et528: et528 {
+	EL721: EL721 {
 		compatible = "fp-egistec";
 		status = "ok";
 		reg = <0>;
@@ -136,7 +87,7 @@
 		interrupts = <17 0x0>;
 		fp-ctrl-power;
 		fp-gpio-vcc-enable;
-		egistec,gpio_vcc_en = <&tlmm 38 0x0>;
+		egistec,gpio_vcc_en = <&tlmm 100 0x0>;
 		egistec,gpio_irq = <&tlmm 17 0x0>;
 		egistec,gpio_reset = <&tlmm 18 0x0>;
 		pinctrl-names = "egis_rst_high", "egis_rst_low", "egis_irq_active",
@@ -148,17 +99,4 @@
 		pinctrl-4 = <&ets_vcc_low>;
 	};
 
-	silead: silead {
-		compatible = "sil,silead_fp";
-		status = "ok";
-		reg = <0>;
-		interrupt-parent = <&tlmm>;
-		interrupts = <17 0x0>;
-		avdd-gpios = <&tlmm 38 0x0>;
-		irq-gpios = <&tlmm 17 0x0>;
-		rst-gpios = <&tlmm 18 0x0>;
-		pinctrl-names = "default", "suspend";
-		pinctrl-0 = <&fps_rst_active &fps_int_active>;
-		pinctrl-1 = <&fps_rst_suspend &fps_int_suspend>;
-	};
 };
diff --git a/qcom/blair-bangkk-common-overlay.dtsi b/qcom/blair-bangkk-common-overlay.dtsi
index 1fefa49b4db7..1302232c0b36 100644
--- a/qcom/blair-bangkk-common-overlay.dtsi
+++ b/qcom/blair-bangkk-common-overlay.dtsi
@@ -485,7 +485,16 @@
 	ldo_vib {
 		compatible = "moto,vibrator-ldo";
 		moto,vib-ldo-gpio = <&tlmm 100 0x0>;
-		status = "ok";
+		status = "disabled";
+	};
+
+	qcom,tz_gpio {
+		compatible = "qcom,tz_gpio";
+		tlmm-tz = <0>,
+			<13>,
+			<14>,
+			<15>,
+			<16>;
 	};
 };