diff --git a/arch/arm/boot/dts/xilinx/ni-bluefin.dts b/arch/arm/boot/dts/xilinx/ni-bluefin.dts
index 05d4b0ef837f9..5a8e835ea2f71 100644
--- a/arch/arm/boot/dts/xilinx/ni-bluefin.dts
+++ b/arch/arm/boot/dts/xilinx/ni-bluefin.dts
@@ -64,9 +64,6 @@
 
 &gem0 {
 	status = "okay";
-	emio-speed-gpios = <0>,
-			   <&gpio0 54 0>;
-
 	#address-cells = <0x1>;
 	#size-cells = <0x0>;
 
@@ -75,6 +72,55 @@
 		full-duplex;
 		reg = <0>;
 	};
+
+	mdio0: mdio {
+		status = "okay";
+	};
+};
+
+&mdio0 {
+	#address-cells = <1>;
+	#size-cells = <0>;
+
+	switch: switch@0 {
+		compatible = "marvell,mv88e6085";
+		reg = <0x0>;
+		status = "okay";
+
+		ports {
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			port@0 {
+				reg = <0>;
+				label = "cpu";
+				phy-mode = "rgmii-id";
+				ethernet = <&gem0>;
+				fixed-link {
+					speed = <1000>;
+					full-duplex;
+				};
+			};
+
+			port@1 {
+				reg = <1>;
+				label = "sw0";
+				fixed-link {
+					speed = <1000>;
+					full-duplex;
+				};
+			};
+
+			port@2 {
+				reg = <2>;
+				label = "sw1";
+				fixed-link {
+					speed = <1000>;
+					full-duplex;
+				};
+			};
+		};
+	};
 };
 
 &uart1 {
diff --git a/arch/arm/configs/nati_bluefin_defconfig b/arch/arm/configs/nati_bluefin_defconfig
index 887096c71fd58..b58a76585a312 100644
--- a/arch/arm/configs/nati_bluefin_defconfig
+++ b/arch/arm/configs/nati_bluefin_defconfig
@@ -60,7 +60,6 @@ CONFIG_BRIDGE_EBT_MARK_T=y
 CONFIG_BRIDGE=y
 CONFIG_BRIDGE_VLAN_FILTERING=y
 CONFIG_NET_DSA=y
-CONFIG_NET_DSA_MV88E6XXX_ONLY_8021AS=y
 CONFIG_VLAN_8021Q=y
 CONFIG_NET_SCHED=y
 CONFIG_DEVTMPFS=y
@@ -90,6 +89,8 @@ CONFIG_CHR_DEV_SG=y
 CONFIG_NETDEVICES=y
 CONFIG_BONDING=y
 CONFIG_TUN=y
+CONFIG_NET_DSA_MV88E6XXX=y
+CONFIG_NET_DSA_MV88E6XXX_PTP=y
 CONFIG_MACB=y
 # CONFIG_NET_VENDOR_CIRRUS is not set
 # CONFIG_NET_VENDOR_FARADAY is not set