diff --git a/target/linux/kirkwood/files/arch/arm/boot/dts/kirkwood-ea3500.dts b/target/linux/kirkwood/files/arch/arm/boot/dts/kirkwood-ea3500.dts
index d0f2e35343a..94697866dc3 100644
--- a/target/linux/kirkwood/files/arch/arm/boot/dts/kirkwood-ea3500.dts
+++ b/target/linux/kirkwood/files/arch/arm/boot/dts/kirkwood-ea3500.dts
@@ -125,6 +125,7 @@
 
 			port@5 {
 				reg = <5>;
+				phy-mode = "rgmii-id";
 				ethernet = <&eth0port>;
 				fixed-link {
 					speed = <1000>;
@@ -223,6 +224,7 @@
 	ethernet0-port@0 {
 		speed = <1000>;
 		duplex = <1>;
+		phy-mode = "rgmii";
 	};
 };
 
diff --git a/target/linux/kirkwood/patches-6.1/004-6.4-ARM-dts-kirkwood-Add-missing-phy-mode-and-fixed-link.patch b/target/linux/kirkwood/patches-6.1/004-6.4-ARM-dts-kirkwood-Add-missing-phy-mode-and-fixed-link.patch
new file mode 100644
index 00000000000..fd7adc35844
--- /dev/null
+++ b/target/linux/kirkwood/patches-6.1/004-6.4-ARM-dts-kirkwood-Add-missing-phy-mode-and-fixed-link.patch
@@ -0,0 +1,108 @@
+From 8aea8659a5f3ae8dc63c9f632ce1f676a1483556 Mon Sep 17 00:00:00 2001
+From: Andrew Lunn <andrew@lunn.ch>
+Date: Fri, 7 Apr 2023 17:17:20 +0200
+Subject: [PATCH] ARM: dts: kirkwood: Add missing phy-mode and fixed links
+
+The DSA framework has got more picky about always having a phy-mode
+for the CPU port. The Kirkwood Ethernet is an RGMII port. Set the
+switch to impose the RGMII delays.
+
+Additionally, the cpu label has never actually been used in the
+binding, so remove it.
+
+Signed-off-by: Andrew Lunn <andrew@lunn.ch>
+Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
+---
+ arch/arm/boot/dts/kirkwood-dir665.dts          | 3 ++-
+ arch/arm/boot/dts/kirkwood-l-50.dts            | 2 +-
+ arch/arm/boot/dts/kirkwood-linksys-viper.dts   | 3 ++-
+ arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts | 3 ++-
+ arch/arm/boot/dts/kirkwood-rd88f6281.dtsi      | 2 +-
+ 5 files changed, 8 insertions(+), 5 deletions(-)
+
+--- a/arch/arm/boot/dts/kirkwood-dir665.dts
++++ b/arch/arm/boot/dts/kirkwood-dir665.dts
+@@ -232,7 +232,7 @@
+ 
+ 			port@6 {
+ 				reg = <6>;
+-				label = "cpu";
++				phy-mode = "rgmii-id";
+ 				ethernet = <&eth0port>;
+ 				fixed-link {
+ 					speed = <1000>;
+@@ -251,6 +251,7 @@
+ 	ethernet0-port@0 {
+ 		speed = <1000>;
+ 		duplex = <1>;
++		phy-mode = "rgmii";
+ 	};
+ };
+ 
+--- a/arch/arm/boot/dts/kirkwood-l-50.dts
++++ b/arch/arm/boot/dts/kirkwood-l-50.dts
+@@ -254,7 +254,6 @@
+ 
+ 			port@6 {
+ 				reg = <6>;
+-				label = "cpu";
+ 				phy-mode = "rgmii-id";
+ 				ethernet = <&eth1port>;
+ 				fixed-link {
+@@ -330,6 +329,7 @@
+ 	ethernet1-port@0 {
+ 		speed = <1000>;
+ 		duplex = <1>;
++		phy-mode = "rgmii";
+ 	};
+ };
+ 
+--- a/arch/arm/boot/dts/kirkwood-linksys-viper.dts
++++ b/arch/arm/boot/dts/kirkwood-linksys-viper.dts
+@@ -198,7 +198,7 @@
+ 
+ 			port@5 {
+ 				reg = <5>;
+-				label = "cpu";
++				phy-mode = "rgmii-id";
+ 				ethernet = <&eth0port>;
+ 				fixed-link {
+ 					speed = <1000>;
+@@ -221,6 +221,7 @@
+ 	ethernet0-port@0 {
+ 		speed = <1000>;
+ 		duplex = <1>;
++		phy-mode = "rgmii";
+ 	};
+ };
+ 
+--- a/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
++++ b/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
+@@ -149,7 +149,7 @@
+ 
+ 			port@5 {
+ 				reg = <5>;
+-				label = "cpu";
++				phy-mode = "rgmii-id";
+ 				ethernet = <&eth0port>;
+ 				fixed-link {
+ 					speed = <1000>;
+@@ -166,6 +166,7 @@
+ 	ethernet0-port@0 {
+ 		speed = <1000>;
+ 		duplex = <1>;
++		phy-mode = "rgmii";
+ 	};
+ };
+ 
+--- a/arch/arm/boot/dts/kirkwood-rd88f6281.dtsi
++++ b/arch/arm/boot/dts/kirkwood-rd88f6281.dtsi
+@@ -105,7 +105,7 @@
+ 
+ 			port@5 {
+ 				reg = <5>;
+-				label = "cpu";
++				phy-mode = "rgmii-id";
+ 				ethernet = <&eth0port>;
+ 				fixed-link {
+ 					speed = <1000>;