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 index ebcf48420b..eab9a256d7 100644 --- 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 @@ -1,47 +1,64 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Milivoje Legenovic +Date: Sat, 22 Mar 2025 13:46:35 +0100 +Subject: [ARCHEOLOGY] Fix for ethernet warnings in dmesg output + +> X-Git-Archeology: - Revision 896a8090c1c194999591326b1dcb55b377e4460c: https://github.com/armbian/build/commit/896a8090c1c194999591326b1dcb55b377e4460c +> X-Git-Archeology: Date: Sat, 22 Mar 2025 13:46:35 +0100 +> X-Git-Archeology: From: Milivoje Legenovic +> X-Git-Archeology: Subject: Fix for ethernet warnings in dmesg output +> X-Git-Archeology: +--- + arch/arm64/boot/dts/rockchip/rk3588s-odroid-m2.dts | 14 ++++++++-- + 1 file changed, 12 insertions(+), 2 deletions(-) + 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 +index 111111111111..222222222222 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-handle = <&rgmii_phy1>; - phy-mode = "rgmii-id"; + phy-mode = "rgmii"; - phy-supply = <&vcc_3v3_s0>; - pinctrl-names = "default"; - pinctrl-0 = <&gmac1_miim + 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"; + &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>; + 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>; + 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>; + usb { + usb2_host_pwren: usb2-host-pwren { + rockchip,pins = <1 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>; +-- +Armbian + diff --git a/patch/kernel/archive/rockchip64-6.14/board-rockpro64-0001-Add-pcie-bus-scan-delay.patch b/patch/kernel/archive/rockchip64-6.14/board-rockpro64-0001-Add-pcie-bus-scan-delay.patch index ca5e858fe9..2c7b06e6aa 100644 --- a/patch/kernel/archive/rockchip64-6.14/board-rockpro64-0001-Add-pcie-bus-scan-delay.patch +++ b/patch/kernel/archive/rockchip64-6.14/board-rockpro64-0001-Add-pcie-bus-scan-delay.patch @@ -13,8 +13,8 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi b/arch/arm64/boo index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi -@@ -663,6 +663,7 @@ &pcie0 { - pinctrl-0 = <&pcie_perst>; +@@ -677,6 +677,7 @@ &pcie0 { + vpcie1v8-supply = <&vcca_1v8>; vpcie12v-supply = <&vcc12v_dcin>; vpcie3v3-supply = <&vcc3v3_pcie>; + bus-scan-delay-ms = <1000>; diff --git a/patch/kernel/archive/rockchip64-6.14/board-rockpro64-change-rx_delay-for-gmac.patch b/patch/kernel/archive/rockchip64-6.14/board-rockpro64-change-rx_delay-for-gmac.patch index c24d7568d6..5ab1edbdc7 100644 --- a/patch/kernel/archive/rockchip64-6.14/board-rockpro64-change-rx_delay-for-gmac.patch +++ b/patch/kernel/archive/rockchip64-6.14/board-rockpro64-change-rx_delay-for-gmac.patch @@ -12,7 +12,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi b/arch/arm64/boo index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi -@@ -307,7 +307,7 @@ &gmac { +@@ -317,7 +317,7 @@ &gmac { snps,reset-active-low; snps,reset-delays-us = <0 10000 50000>; tx_delay = <0x28>; diff --git a/patch/kernel/archive/rockchip64-6.14/board-rockpro64-fix-emmc.patch b/patch/kernel/archive/rockchip64-6.14/board-rockpro64-fix-emmc.patch index d0b6d530a5..96fdbdcf04 100644 --- a/patch/kernel/archive/rockchip64-6.14/board-rockpro64-fix-emmc.patch +++ b/patch/kernel/archive/rockchip64-6.14/board-rockpro64-fix-emmc.patch @@ -20,7 +20,7 @@ index 111111111111..222222222222 100644 stdout-path = "serial2:1500000n8"; }; -@@ -815,6 +816,7 @@ &sdmmc { +@@ -829,6 +830,7 @@ &sdmmc { &sdhci { bus-width = <8>; diff --git a/patch/kernel/archive/rockchip64-6.14/board-rockpro64-fix-spi1-flash-speed.patch b/patch/kernel/archive/rockchip64-6.14/board-rockpro64-fix-spi1-flash-speed.patch index d236859299..675fb66b3c 100644 --- a/patch/kernel/archive/rockchip64-6.14/board-rockpro64-fix-spi1-flash-speed.patch +++ b/patch/kernel/archive/rockchip64-6.14/board-rockpro64-fix-spi1-flash-speed.patch @@ -12,7 +12,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi b/arch/arm64/boo index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi -@@ -838,7 +838,7 @@ &spi1 { +@@ -852,7 +852,7 @@ &spi1 { flash@0 { compatible = "jedec,spi-nor"; reg = <0>; diff --git a/patch/kernel/archive/rockchip64-6.14/rk3588-0132-Fix-label-name-of-hdptxphy-for-RK3588.patch b/patch/kernel/archive/rockchip64-6.14/rk3588-0132-Fix-label-name-of-hdptxphy-for-RK3588.patch index dbb68ff515..d0be509478 100644 --- a/patch/kernel/archive/rockchip64-6.14/rk3588-0132-Fix-label-name-of-hdptxphy-for-RK3588.patch +++ b/patch/kernel/archive/rockchip64-6.14/rk3588-0132-Fix-label-name-of-hdptxphy-for-RK3588.patch @@ -265,7 +265,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-odroid-m2.dts b/arch/arm64/boo index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-odroid-m2.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-odroid-m2.dts -@@ -264,7 +264,7 @@ hdmi0_out_con: endpoint { +@@ -266,7 +266,7 @@ hdmi0_out_con: endpoint { }; }; diff --git a/patch/kernel/archive/rockchip64-6.14/rk3588-1012-arm64-dts-rockchip-add-hdmi1-support-to-ROCK-5-ITX.patch b/patch/kernel/archive/rockchip64-6.14/rk3588-1012-arm64-dts-rockchip-add-hdmi1-support-to-ROCK-5-ITX.patch index 1508846e94..4abccfdae9 100644 --- a/patch/kernel/archive/rockchip64-6.14/rk3588-1012-arm64-dts-rockchip-add-hdmi1-support-to-ROCK-5-ITX.patch +++ b/patch/kernel/archive/rockchip64-6.14/rk3588-1012-arm64-dts-rockchip-add-hdmi1-support-to-ROCK-5-ITX.patch @@ -69,7 +69,7 @@ index 111111111111..222222222222 100644 &i2c0 { pinctrl-names = "default"; pinctrl-0 = <&i2c0m2_xfer>; -@@ -1209,3 +1243,18 @@ &usbdp_phy1 { +@@ -1208,3 +1242,18 @@ &usbdp_phy1 { rockchip,dp-lane-mux = <2 3>; status = "okay"; };