diff --git a/qcom/blair-rhodep-common-overlay.dtsi b/qcom/blair-rhodep-common-overlay.dtsi
index bba7ad8505dc..f2996051cf34 100644
--- a/qcom/blair-rhodep-common-overlay.dtsi
+++ b/qcom/blair-rhodep-common-overlay.dtsi
@@ -231,7 +231,7 @@
 	st21nfc@8 {
 		compatible = "st,st21nfc";
 		mmi,status = "/chosen", "mmi,nfc", "st";
-		status = "ok";
+		status = "disable";
 		reg = <0x08>;
 		st,irq_gpio = <&tlmm 9 0x00>;
 		st,reset_gpio = <&tlmm 6 0x00>;
diff --git a/qcom/rhodep-fps-overlay.dtsi b/qcom/rhodep-fps-overlay.dtsi
index 364d5a440a08..3d520dc22193 100644
--- a/qcom/rhodep-fps-overlay.dtsi
+++ b/qcom/rhodep-fps-overlay.dtsi
@@ -44,12 +44,12 @@
 	ets_vcc_high: ets_vcc_high {
 		/* INTERRUPT */
 		mux {
-			pins = "gpio38";
+			pins = "gpio6";
 			function = "gpio";
 		};
 
 		config {
-			pins = "gpio38";
+			pins = "gpio6";
 			drive-strength = <2>; /* 2 MA */
 			output-high;
 		};
@@ -58,12 +58,12 @@
 	ets_vcc_low: ets_vcc_low {
 		/* INTERRUPT */
 		mux {
-			pins = "gpio38";
+			pins = "gpio6";
 			function = "gpio";
 		};
 
 		config {
-			pins = "gpio38";
+			pins = "gpio6";
 			drive-strength = <2>; /* 2 MA */
 			output-low;
 		};
@@ -136,7 +136,7 @@
 		interrupts = <17 0x0>;
 		fp-ctrl-power;
 		fp-gpio-vcc-enable;
-		egistec,gpio_vcc_en = <&tlmm 38 0x0>;
+		egistec,gpio_vcc_en = <&tlmm 6 0x0>;
 		egistec,gpio_irq = <&tlmm 17 0x0>;
 		egistec,gpio_reset = <&tlmm 18 0x0>;
 		pinctrl-names = "egis_rst_high", "egis_rst_low", "egis_irq_active",