diff --git a/feeds/ipq807x_v5.4/ipq50xx/base-files/etc/board.d/02_network b/feeds/ipq807x_v5.4/ipq50xx/base-files/etc/board.d/02_network
index bed9bc8bb..2f5b1a1d7 100755
--- a/feeds/ipq807x_v5.4/ipq50xx/base-files/etc/board.d/02_network
+++ b/feeds/ipq807x_v5.4/ipq50xx/base-files/etc/board.d/02_network
@@ -27,10 +27,6 @@ qcom_setup_interfaces()
 	cybertan,eww631-b1)
 		ucidef_add_switch "switch1" "5:wan" "2:lan" "3:lan" "4:lan" "6@eth0"
 		;;
-	cybertan,rap630w-312g)
-		ucidef_add_switch "switch1" \
-			"6@eth1" "1:lan" "2:lan" "3:lan" "4:lan" "5:wan"
-		;;
 	udaya,a6-id2)
 		ucidef_set_interface_wan "eth1"
 		ucidef_set_interface_lan "eth0"
@@ -63,6 +59,7 @@ qcom_setup_interfaces()
                 ucidef_set_interface_wan "eth0"
                 ucidef_set_interface_lan "eth1"
                 ;;
+	cybertan,rap630w-312g|\
 	yuncore,fap655)
 		ucidef_add_switch "switch1" \
 			"6@eth0" "1:lan" "2:lan" "3:lan" "4:lan" "5:wan"
diff --git a/feeds/ipq807x_v5.4/ipq50xx/files/arch/arm64/boot/dts/qcom/qcom-ipq5018-rap630w-312g.dts b/feeds/ipq807x_v5.4/ipq50xx/files/arch/arm64/boot/dts/qcom/qcom-ipq5018-rap630w-312g.dts
index 17f168a49..84081bc11 100755
--- a/feeds/ipq807x_v5.4/ipq50xx/files/arch/arm64/boot/dts/qcom/qcom-ipq5018-rap630w-312g.dts
+++ b/feeds/ipq807x_v5.4/ipq50xx/files/arch/arm64/boot/dts/qcom/qcom-ipq5018-rap630w-312g.dts
@@ -30,8 +30,7 @@
 		sdhc1 = &sdhc_1; /* SDC1 eMMC slot */
 		serial0 = &blsp1_uart1;
 		serial1 = &blsp1_uart2;
-		ethernet0 = "/soc/dp1";
-                ethernet1 = "/soc/dp2";
+		ethernet1 = "/soc/dp1";
 
 		led-boot = &led_power;
 		led-failsafe = &led_power;
@@ -375,7 +374,7 @@
 						port_id = <1>;
 						phy_address = <7>;
 						phy_dac = <0x10 0x10>;
-						mdiobus = <&mdio0>;
+						mdio-bus = <&mdio0>;
 					};
 					port@1 {
 						mdio-bus = <&mdio0>;
@@ -441,22 +440,6 @@
 		};
 
 		dp1 {
-			device_type = "network";
-			compatible = "qcom,nss-dp";
-			clocks = <&gcc GCC_SNOC_GMAC0_AXI_CLK>;
-			clock-names = "nss-snoc-gmac-axi-clk";
-			qcom,id = <1>;
-			reg = <0x39C00000 0x10000>;
-			interrupts = <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>;
-			qcom,mactype = <2>;
-			qcom,link-poll = <1>;
-			qcom,phy-mdio-addr = <7>;
-			mdio-bus = <&mdio0>;
-			local-mac-address = [000000000000];
-			phy-mode = "sgmii";
-		};
-
-		dp2 {
 			device_type = "network";
 			compatible = "qcom,nss-dp";
 			clocks = <&gcc GCC_SNOC_GMAC1_AXI_CLK>;