diff --git a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3mini-emmc.dts b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3mini-emmc.dts
index 2a7064088a..ed65e201d7 100644
--- a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3mini-emmc.dts
+++ b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3mini-emmc.dts
@@ -321,13 +321,6 @@
 
 &pio {
 
-	/* GPIO 11 NGFF_GNSS_OFF. output-high: enable, output-low: disable */
-	gnss_off {
-		gpio-hog;
-		gpios = <11 GPIO_ACTIVE_HIGH>;
-		output-high;
-	};
-
         mmc0_pins_default: mmc0-pins-50-to-61-default {
                 mux {
                         function = "flash";
@@ -403,6 +396,39 @@
 		};
 	};
 
+	usb_ngff_pins: usb-ngff-pins {
+		ngff-gnss-off {
+			pins = "GPIO_6";
+			drive-strength = <MTK_DRIVE_8mA>;
+			mediatek,pull-up-adv = <1>;
+		};
+		ngff-pe-rst {
+			pins = "GPIO_7";
+			drive-strength = <MTK_DRIVE_8mA>;
+			mediatek,pull-up-adv = <1>;
+		};
+		ngff-wwan-off {
+			pins = "GPIO_8";
+			drive-strength = <MTK_DRIVE_8mA>;
+			mediatek,pull-up-adv = <1>;
+		};
+		ngff-pwr-off {
+			pins = "GPIO_9";
+			drive-strength = <MTK_DRIVE_8mA>;
+			mediatek,pull-up-adv = <1>;
+		};
+		ngff-rst {
+			pins = "GPIO_10";
+			drive-strength = <MTK_DRIVE_8mA>;
+			mediatek,pull-up-adv = <1>;
+		};
+		ngff-coex {
+			pins = "SPI1_CS";
+			drive-strength = <MTK_DRIVE_8mA>;
+			mediatek,pull-up-adv = <1>;
+		};
+	};
+
 	wf_2g_5g_pins: wf_2g_5g-pins {
 		mux {
 			function = "wifi";
@@ -437,3 +463,9 @@
 		};
 	};
 };
+
+&xhci {
+	pinctrl-names = "default";
+	pinctrl-0 = <&usb_ngff_pins>;
+	status = "okay";
+};