From 896a8090c1c194999591326b1dcb55b377e4460c Mon Sep 17 00:00:00 2001
From: Milivoje Legenovic <m.legenovic@gmail.com>
Date: Fri, 21 Mar 2025 11:40:22 +0100
Subject: [PATCH] Fix for ethernet warnings in dmesg output

---
 config/boards/odroidm2.csc                    |  4 +-
 .../board-odroidm2-fix-for-ethernet.patch     | 47 +++++++++++++++++++
 .../001-odroid-m2-fix-for-ethernet.patch      | 47 +++++++++++++++++++
 3 files changed, 96 insertions(+), 2 deletions(-)
 create mode 100644 patch/kernel/archive/rockchip64-6.14/board-odroidm2-fix-for-ethernet.patch
 create mode 100644 patch/u-boot/v2025.04-rc4/board_odroidm2/001-odroid-m2-fix-for-ethernet.patch

diff --git a/config/boards/odroidm2.csc b/config/boards/odroidm2.csc
index 6d3cfe972..b9894386a 100644
--- a/config/boards/odroidm2.csc
+++ b/config/boards/odroidm2.csc
@@ -10,9 +10,9 @@ IMAGE_PARTITION_TABLE="gpt"
 FULL_DESKTOP="no"
 BOOT_LOGO="yes"
 
-BOOTBRANCH_BOARD="tag:v2025.04-rc2"
+BOOTBRANCH_BOARD="tag:v2025.04-rc4"
 BOOTBRANCH="${BOOTBRANCH_BOARD}"
-BOOTPATCHDIR="v2025.04-rc2"
+BOOTPATCHDIR="v2025.04-rc4"
 
 BOOTCONFIG="odroid-m2-rk3588s_defconfig"
 BOOTDIR="u-boot-${BOARD}" # do not share u-boot directory
diff --git a/patch/kernel/archive/rockchip64-6.14/board-odroidm2-fix-for-ethernet.patch b/patch/kernel/archive/rockchip64-6.14/board-odroidm2-fix-for-ethernet.patch
new file mode 100644
index 000000000..ebcf48420
--- /dev/null
+++ b/patch/kernel/archive/rockchip64-6.14/board-odroidm2-fix-for-ethernet.patch
@@ -0,0 +1,47 @@
+diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-odroid-m2.dts b/arch/arm64/boot/dts/rockchip/rk3588s-odroid-m2.dts
+index 8f034c6d494c..ef0f4280048d 100644
+--- a/arch/arm64/boot/dts/rockchip/rk3588s-odroid-m2.dts
++++ b/arch/arm64/boot/dts/rockchip/rk3588s-odroid-m2.dts
+@@ -229,9 +229,9 @@ &cpu_l3 {
+ };
+
+ &gmac1 {
+-	clock_in_out = "output";
++	clock_in_out = "input";
+	phy-handle = <&rgmii_phy1>;
+-	phy-mode = "rgmii-id";
++	phy-mode = "rgmii";
+	phy-supply = <&vcc_3v3_s0>;
+	pinctrl-names = "default";
+	pinctrl-0 = <&gmac1_miim
+@@ -241,6 +241,8 @@ &gmac1_rgmii_clk
+		     &gmac1_rgmii_bus
+		     &gmac1_clkinout>;
+	status = "okay";
++	tx_delay = <0x3a>;
++	rx_delay = <0x3e>;
+ };
+
+ &gpu {
+@@ -400,6 +402,8 @@ &mdio1 {
+	rgmii_phy1: ethernet-phy@1 {
+		compatible = "ethernet-phy-id001c.c916";
+		reg = <1>;
++		pinctrl-names = "default";
++		pinctrl-0 = <&rtl8211f_rst>;
+		reset-assert-us = <20000>;
+		reset-deassert-us = <100000>;
+		reset-gpios = <&gpio3 RK_PB7 GPIO_ACTIVE_LOW>;
+@@ -475,6 +479,12 @@ pcf8563_int: pcf8563-int {
+		};
+	};
+
++	rtl8211f {
++		rtl8211f_rst: rtl8211f-rst {
++			rockchip,pins = <3 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>;
++		};
++	};
++
+	usb {
+		usb2_host_pwren: usb2-host-pwren {
+			rockchip,pins = <1 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
diff --git a/patch/u-boot/v2025.04-rc4/board_odroidm2/001-odroid-m2-fix-for-ethernet.patch b/patch/u-boot/v2025.04-rc4/board_odroidm2/001-odroid-m2-fix-for-ethernet.patch
new file mode 100644
index 000000000..a1a4cb36c
--- /dev/null
+++ b/patch/u-boot/v2025.04-rc4/board_odroidm2/001-odroid-m2-fix-for-ethernet.patch
@@ -0,0 +1,47 @@
+diff --git a/dts/upstream/src/arm64/rockchip/rk3588s-odroid-m2.dts b/dts/upstream/src/arm64/rockchip/rk3588s-odroid-m2.dts
+index 8f034c6d49..ef0f428004 100644
+--- a/dts/upstream/src/arm64/rockchip/rk3588s-odroid-m2.dts
++++ b/dts/upstream/src/arm64/rockchip/rk3588s-odroid-m2.dts
+@@ -229,9 +229,9 @@
+ };
+
+ &gmac1 {
+-	clock_in_out = "output";
++	clock_in_out = "input";
+	phy-handle = <&rgmii_phy1>;
+-	phy-mode = "rgmii-id";
++	phy-mode = "rgmii";
+	phy-supply = <&vcc_3v3_s0>;
+	pinctrl-names = "default";
+	pinctrl-0 = <&gmac1_miim
+@@ -241,6 +241,8 @@
+		     &gmac1_rgmii_bus
+		     &gmac1_clkinout>;
+	status = "okay";
++	tx_delay = <0x3a>;
++	rx_delay = <0x3e>;
+ };
+
+ &gpu {
+@@ -400,6 +402,8 @@
+	rgmii_phy1: ethernet-phy@1 {
+		compatible = "ethernet-phy-id001c.c916";
+		reg = <1>;
++		pinctrl-names = "default";
++		pinctrl-0 = <&rtl8211f_rst>;
+		reset-assert-us = <20000>;
+		reset-deassert-us = <100000>;
+		reset-gpios = <&gpio3 RK_PB7 GPIO_ACTIVE_LOW>;
+@@ -475,6 +479,12 @@
+		};
+	};
+
++	rtl8211f {
++		rtl8211f_rst: rtl8211f-rst {
++			rockchip,pins = <3 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>;
++		};
++	};
++
+	usb {
+		usb2_host_pwren: usb2-host-pwren {
+			rockchip,pins = <1 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;