From 2613235692759d0b67250a4114b7d1b773afeb04 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Tue, 27 Feb 2024 21:25:35 +0800 Subject: [PATCH] rockchip: rock-3a: move reset properties to gmac node Resetting via phy node may not work for rk356x. Signed-off-by: Tianling Shen --- .../armv8/base-files/etc/board.d/02_network | 1 + ...0-arm64-rockchip-add-OF-node-for-eth.patch | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/target/linux/rockchip/armv8/base-files/etc/board.d/02_network b/target/linux/rockchip/armv8/base-files/etc/board.d/02_network index da1738899c..1968b5267c 100644 --- a/target/linux/rockchip/armv8/base-files/etc/board.d/02_network +++ b/target/linux/rockchip/armv8/base-files/etc/board.d/02_network @@ -53,6 +53,7 @@ rockchip_setup_macs() local label_mac="" case "$board" in + ariaboard,photonicat|\ ezpro,mrkaio-m68s|\ friendlyarm,nanopc-t6|\ friendlyarm,nanopi-r2c|\ diff --git a/target/linux/rockchip/patches-6.1/610-arm64-rockchip-add-OF-node-for-eth.patch b/target/linux/rockchip/patches-6.1/610-arm64-rockchip-add-OF-node-for-eth.patch index 0b00b1d40b..2b8d591b67 100644 --- a/target/linux/rockchip/patches-6.1/610-arm64-rockchip-add-OF-node-for-eth.patch +++ b/target/linux/rockchip/patches-6.1/610-arm64-rockchip-add-OF-node-for-eth.patch @@ -174,6 +174,30 @@ Signed-off-by: David Bauer }; }; +--- a/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts ++++ b/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts +@@ -273,6 +273,10 @@ + &gmac1m1_rgmii_clk + &gmac1m1_clkinout + &gmac1m1_rgmii_bus>; ++ snps,reset-gpio = <&gpio3 RK_PB0 GPIO_ACTIVE_LOW>; ++ snps,reset-active-low; ++ /* Reset time is 20ms, 100ms for rtl8211f */ ++ snps,reset-delays-us = <0 20000 100000>; + status = "okay"; + }; + +@@ -593,9 +597,7 @@ + reg = <0x0>; + pinctrl-names = "default"; + pinctrl-0 = <ð_phy_rst>; +- reset-assert-us = <20000>; +- reset-deassert-us = <100000>; +- reset-gpios = <&gpio3 RK_PB0 GPIO_ACTIVE_LOW>; ++ realtek,led-data = <0x6d60>; + }; + }; + --- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts @@ -531,6 +531,17 @@