diff --git a/qcom/holi-ibiza-common-overlay.dtsi b/qcom/holi-ibiza-common-overlay.dtsi
index dbecaa27efc6..17191766ad15 100644
--- a/qcom/holi-ibiza-common-overlay.dtsi
+++ b/qcom/holi-ibiza-common-overlay.dtsi
@@ -41,6 +41,99 @@
 			bias-pull-up;
 		};
 	};
+
+	nfc {
+		nfc_int_active: nfc_int_active {
+			/* active state */
+			mux {
+				/* GPIO 9: NFC Read Interrupt */
+				pins = "gpio9";
+				function = "gpio";
+			};
+
+			config {
+				pins = "gpio9";
+				drive-strength = <2>; /* 2 MA */
+				bias-disable;
+			};
+		};
+
+		nfc_int_suspend: nfc_int_suspend {
+			/* sleep state */
+			mux {
+				/* GPIO 9: NFC Read Interrupt */
+				pins = "gpio9";
+				function = "gpio";
+			};
+
+			config {
+				pins = "gpio9";
+				drive-strength = <2>; /* 2 MA */
+				bias-disable;
+			};
+		};
+
+		nfc_enable_active: nfc_enable_active {
+			mux {
+				/* 48: Enable, 8: Firmware*/
+				pins = "gpio48", "gpio8";
+				function = "gpio";
+			};
+
+			config {
+				pins = "gpio48", "gpio8";
+				drive-strength = <2>; /* 2 MA */
+				bias-disable;
+			};
+		};
+
+		nfc_enable_suspend: nfc_enable_suspend {
+			mux {
+				/* 48: Enable, 8: Firmware */
+				pins = "gpio48", "gpio8";
+				function = "gpio";
+			};
+
+			config {
+				pins = "gpio48", "gpio8";
+				drive-strength = <2>; /* 2 MA */
+				bias-disable;
+			};
+		};
+
+
+		nfc_clk_req_active: nfc_clk_req_active {
+			/* active state */
+			mux {
+				/* GPIO 7: NFC CLK Req*/
+				pins = "gpio7";
+				function = "gpio";
+			};
+
+			config {
+				pins = "gpio7";
+				drive-strength = <2>; /* 2 MA */
+				bias-disable;
+				input-enable;
+			};
+		};
+
+		nfc_clk_req_suspend: nfc_clk_req_suspend {
+			/* sleep state */
+			mux {
+				/* GPIO 7: NFC CLK Req */
+				pins = "gpi7";
+				function = "gpio";
+			};
+
+			config {
+				pins = "gpio7";
+				drive-strength = <2>; /* 2 MA */
+				bias-disable;
+				input-enable;
+			};
+		};
+	};
 };
 
 
@@ -154,6 +247,27 @@
 	};
 };
 
+
+&qupv3_se7_i2c {
+	status = "ok";
+	nq@28 {
+		compatible = "qcom,sn-nci";
+		reg = <0x28>;
+		qcom,sn-irq = <&tlmm 9 0x00>;
+		qcom,sn-ven = <&tlmm 48 0x00>;
+		qcom,sn-firm = <&tlmm 8 0x00>;
+		qcom,sn-clkreq = <&tlmm 7 0x00>;
+		interrupt-parent = <&tlmm>;
+		interrupts = <9 0>;
+		interrupt-names = "nfc_irq";
+		pinctrl-names = "nfc_active", "nfc_suspend";
+		pinctrl-0 = <&nfc_int_active &nfc_enable_active
+				&nfc_clk_req_active>;
+		pinctrl-1 = <&nfc_int_suspend &nfc_enable_suspend
+				&nfc_clk_req_suspend>;
+	};
+};
+
 &thermal_zones {
 	pa-therm0-usr {
 		status = "disabled";
diff --git a/qcom/holi-moto-base.dts b/qcom/holi-moto-base.dts
index f42d65fa41c2..4782e90d01a8 100644
--- a/qcom/holi-moto-base.dts
+++ b/qcom/holi-moto-base.dts
@@ -30,3 +30,7 @@
 &reserved_memory {
         /delete-node/ ramoops;
 };
+
+&tlmm {
+	/delete-node/ nfc;
+};
diff --git a/qcom/holi-moto-common-overlay.dtsi b/qcom/holi-moto-common-overlay.dtsi
index 1940687b1a0a..7dfccb2ab038 100644
--- a/qcom/holi-moto-common-overlay.dtsi
+++ b/qcom/holi-moto-common-overlay.dtsi
@@ -125,29 +125,6 @@
 		status = "ok";
 };
 
-&qupv3_se0_i2c {
-	status = "ok";
-	#address-cells = <1>;
-	#size-cells = <0>;
-	nq@28 {
-		compatible = "qcom,sn-nci";
-		reg = <0x28>;
-		qcom,sn-irq = <&tlmm 9 0x00>;
-		qcom,sn-ven = <&tlmm 6 0x00>;
-		qcom,sn-firm = <&tlmm 8 0x00>;
-		qcom,sn-clkreq = <&tlmm 7 0x00>;
-		qcom,sn-vdd-1p8-supply = <&L11A>;
-		qcom,sn-vdd-1p8-voltage = <1800000 1800000>;
-		qcom,sn-vdd-1p8-current = <157000>;
-		interrupt-parent = <&tlmm>;
-		interrupts = <9 0>;
-		interrupt-names = "nfc_irq";
-		pinctrl-names = "nfc_active", "nfc_suspend";
-		pinctrl-0 = <&nfc_int_active &nfc_enable_active>;
-		pinctrl-1 = <&nfc_int_suspend &nfc_enable_suspend>;
-	};
-};
-
 &soc {
 	gpio_keys: gpio_keys {
 		compatible = "gpio-keys";